summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSetup Wizard Team <android-setup-team-eng@google.com>2021-06-16 15:39:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-16 15:39:39 +0000
commit0f6dfca2890ee690ea34a175256c56e13fae74d7 (patch)
tree096454abf50a73063ca997f864b3d5f3255a5899
parente542654899cc513db12b9f63fd313e0a5866c204 (diff)
parentcdc282e9ef3a85c865032e8247cdbf5af499a8dd (diff)
downloadsetupcompat-0f6dfca2890ee690ea34a175256c56e13fae74d7.tar.gz
Import updated Android SetupCompat Library 379335714 am: cdc282e9ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/14963615 Change-Id: I92faf01649d80f6e8ae09c3651e17d86adc8678b
-rw-r--r--exempting_lint_checks.txt3
-rw-r--r--partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java8
-rw-r--r--partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java8
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";