diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-17 02:00:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-17 02:00:48 +0000 |
commit | 41f815e1f9240758cf6d07f90a91f949ae4c087b (patch) | |
tree | 096454abf50a73063ca997f864b3d5f3255a5899 | |
parent | c5584c991db70f7f3b3bdff3b794e444c8fbe0d4 (diff) | |
parent | f29740dfcfd806576590e912fce2fe40e7806754 (diff) | |
download | setupcompat-android12-gsi.tar.gz |
Snap for 7464903 from cdc282e9ef3a85c865032e8247cdbf5af499a8dd to sc-release am: f29740dfcfandroid12-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/15006313
Change-Id: I1223b01a250cf6f3be81f711bca354f35ee007f5
3 files changed, 19 insertions, 0 deletions
diff --git a/exempting_lint_checks.txt b/exempting_lint_checks.txt index f875ad3..90b8caf 100644 --- a/exempting_lint_checks.txt +++ b/exempting_lint_checks.txt @@ -2,3 +2,6 @@ third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setup third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/internal/TemplateLayout.java: CustomViewStyleable: getContext().obtainStyledAttributes(attrs, R.styleable.SucTemplateLayout, defStyleAttr, 0); third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/PartnerCustomizationLayout.java: CustomViewStyleable: attrs, R.styleable.SucPartnerCustomizationLayout, defStyleAttr, 0); third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/internal/TemplateLayout.java: CustomViewStyleable: getContext().obtainStyledAttributes(attrs, R.styleable.SucTemplateLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/PartnerCustomizationLayout.java: CustomViewStyleable: attrs, R.styleable.SucPartnerCustomizationLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/internal/TemplateLayout.java: CustomViewStyleable: getContext().obtainStyledAttributes(attrs, R.styleable.SucTemplateLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/util/SystemBarHelper.java: AnnotateVersionCheck: public static void setImeInsetView(final View view) { diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java index c10055e..280ab81 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java @@ -291,6 +291,14 @@ public enum PartnerConfig { // The divider of list items are showing on the pages. CONFIG_ITEMS_DIVIDER_SHOWN(PartnerConfigKey.KEY_ITEMS_DIVIDER_SHOWN, ResourceType.BOOL), + // The intrinsic width of the card view for foldabe/tablet. + CONFIG_CARD_VIEW_INTRINSIC_WIDTH( + PartnerConfigKey.KEY_CARD_VIEW_INTRINSIC_WIDTH, ResourceType.DIMENSION), + + // The intrinsic height of the card view for foldabe/tablet. + CONFIG_CARD_VIEW_INTRINSIC_HEIGHT( + PartnerConfigKey.KEY_CARD_VIEW_INTRINSIC_HEIGHT, ResourceType.DIMENSION), + // The animation of loading screen used in those activities which is non of below type. CONFIG_PROGRESS_ILLUSTRATION_DEFAULT( PartnerConfigKey.KEY_PROGRESS_ILLUSTRATION_DEFAULT, ResourceType.ILLUSTRATION), diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java index a810908..c7444a5 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java @@ -90,6 +90,8 @@ import java.lang.annotation.RetentionPolicy; PartnerConfigKey.KEY_CONTENT_INFO_ICON_MARGIN_END, PartnerConfigKey.KEY_CONTENT_INFO_PADDING_TOP, PartnerConfigKey.KEY_CONTENT_INFO_PADDING_BOTTOM, + PartnerConfigKey.KEY_CARD_VIEW_INTRINSIC_WIDTH, + PartnerConfigKey.KEY_CARD_VIEW_INTRINSIC_HEIGHT, PartnerConfigKey.KEY_ITEMS_TITLE_TEXT_SIZE, PartnerConfigKey.KEY_ITEMS_SUMMARY_TEXT_SIZE, PartnerConfigKey.KEY_ITEMS_SUMMARY_MARGIN_TOP, @@ -360,6 +362,12 @@ public @interface PartnerConfigKey { // The divider of list items are showing. String KEY_ITEMS_DIVIDER_SHOWN = "setup_design_items_divider_shown"; + // The intrinsic width of the card view for foldabe/tablet. + String KEY_CARD_VIEW_INTRINSIC_WIDTH = "setup_design_card_view_intrinsic_width"; + + // The intrinsic height of the card view for foldabe/tablet. + String KEY_CARD_VIEW_INTRINSIC_HEIGHT = "setup_design_card_view_intrinsic_height"; + // The animation of loading screen used in those activities which is non of below type. String KEY_PROGRESS_ILLUSTRATION_DEFAULT = "progress_illustration_custom_default"; |