diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-10-19 10:36:04 +0800 |
---|---|---|
committer | Nicole Huang <nicolehuang@google.com> | 2021-10-19 14:17:27 +0000 |
commit | 9eb31bddd30d9635aa9c83591baf175f381a6d02 (patch) | |
tree | d88e06c9862e19cb3242f564910073816aca0a72 /partnerconfig | |
parent | 46724f672722ce23b212ff6244ca197b68e44715 (diff) | |
download | setupcompat-9eb31bddd30d9635aa9c83591baf175f381a6d02.tar.gz |
Import updated Android SetupCompat Library 404131397
Copied from google3/third_party/java_src/android_libs/setupcompat
Test: mm
Included changes:
- 404131397 Add log for tracing partner configs
- 403382319 [SetupDesign] Support fullscreen loading animation
- 400617604 Move the set default color to FooterButtonStyleUtil and a...
- 399851125 Add a new partner config(button text color when button di...
Bug: 197289170
PiperOrigin-RevId: 404131397
Change-Id: I0de7420e19b2154949598ba531e07340f345df9a
Diffstat (limited to 'partnerconfig')
3 files changed, 30 insertions, 2 deletions
diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java index 54a2ef8..a9cd4a0 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java @@ -128,6 +128,14 @@ public enum PartnerConfig { CONFIG_FOOTER_BUTTON_DISABLED_BG_COLOR( PartnerConfigKey.KEY_FOOTER_BUTTON_DISABLED_BG_COLOR, ResourceType.COLOR), + // Disabled text color of the primary footer button + CONFIG_FOOTER_PRIMARY_BUTTON_DISABLED_TEXT_COLOR( + PartnerConfigKey.KEY_PRIMARY_BUTTON_DISABLED_TEXT_COLOR, ResourceType.COLOR), + + // Disabled text color of the secondary footer button + CONFIG_FOOTER_SECONDARY_BUTTON_DISABLED_TEXT_COLOR( + PartnerConfigKey.KEY_SECONDARY_BUTTON_DISABLED_TEXT_COLOR, ResourceType.COLOR), + // Background color of the primary footer button CONFIG_FOOTER_PRIMARY_BUTTON_BG_COLOR( PartnerConfigKey.KEY_FOOTER_PRIMARY_BUTTON_BG_COLOR, ResourceType.COLOR), @@ -315,11 +323,11 @@ 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. + // The intrinsic width of the card view for foldable/tablet. CONFIG_CARD_VIEW_INTRINSIC_WIDTH( PartnerConfigKey.KEY_CARD_VIEW_INTRINSIC_WIDTH, ResourceType.DIMENSION), - // The intrinsic height of the card view for foldabe/tablet. + // The intrinsic height of the card view for foldable/tablet. CONFIG_CARD_VIEW_INTRINSIC_HEIGHT( PartnerConfigKey.KEY_CARD_VIEW_INTRINSIC_HEIGHT, ResourceType.DIMENSION), @@ -440,6 +448,10 @@ public enum PartnerConfig { CONFIG_LOADING_LAYOUT_HEADER_HEIGHT( PartnerConfigKey.KEY_LOADING_LAYOUT_HEADER_HEIGHT, ResourceType.DIMENSION), + // Use the fullscreen style lottie animation. + CONFIG_LOADING_LAYOUT_FULL_SCREEN_ILLUSTRATION_ENABLED( + PartnerConfigKey.KEY_LOADING_LAYOUT_FULL_SCREEN_ILLUSTRATION_ENABLED, ResourceType.BOOL), + // The margin top of progress bar. CONFIG_PROGRESS_BAR_MARGIN_TOP( PartnerConfigKey.KEY_PROGRESS_BAR_MARGIN_TOP, ResourceType.DIMENSION), diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java index c0be011..ef39f9f 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java @@ -517,6 +517,8 @@ public class PartnerConfigHelper { /* arg= */ null, /* extras= */ null); partnerResourceCache.clear(); + Log.i( + TAG, "PartnerConfigsBundle=" + (resultBundle != null ? resultBundle.size() : "(null)")); } catch (IllegalArgumentException | SecurityException exception) { Log.w(TAG, "Fail to get config from suw provider"); } diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java index bbededa..b6a3302 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java @@ -55,9 +55,11 @@ import java.lang.annotation.RetentionPolicy; PartnerConfigKey.KEY_FOOTER_PRIMARY_BUTTON_BG_COLOR, PartnerConfigKey.KEY_FOOTER_PRIMARY_BUTTON_TEXT_COLOR, PartnerConfigKey.KEY_FOOTER_PRIMARY_BUTTON_MARGIN_START, + PartnerConfigKey.KEY_PRIMARY_BUTTON_DISABLED_TEXT_COLOR, PartnerConfigKey.KEY_FOOTER_SECONDARY_BUTTON_BG_COLOR, PartnerConfigKey.KEY_FOOTER_SECONDARY_BUTTON_TEXT_COLOR, PartnerConfigKey.KEY_FOOTER_SECONDARY_BUTTON_MARGIN_START, + PartnerConfigKey.KEY_SECONDARY_BUTTON_DISABLED_TEXT_COLOR, PartnerConfigKey.KEY_LAYOUT_BACKGROUND_COLOR, PartnerConfigKey.KEY_LAYOUT_MARGIN_START, PartnerConfigKey.KEY_LAYOUT_MARGIN_END, @@ -134,6 +136,7 @@ import java.lang.annotation.RetentionPolicy; PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_END, PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_BOTTOM, PartnerConfigKey.KEY_LOADING_LAYOUT_HEADER_HEIGHT, + PartnerConfigKey.KEY_LOADING_LAYOUT_FULL_SCREEN_ILLUSTRATION_ENABLED, PartnerConfigKey.KEY_PROGRESS_BAR_MARGIN_TOP, PartnerConfigKey.KEY_PROGRESS_BAR_MARGIN_BOTTOM, }) @@ -236,6 +239,9 @@ public @interface PartnerConfigKey { // Margin start of the primary footer button String KEY_FOOTER_PRIMARY_BUTTON_MARGIN_START = "setup_compat_footer_primary_button_margin_start"; + // Disabled text color of the primary footer button + String KEY_PRIMARY_BUTTON_DISABLED_TEXT_COLOR = "setup_compat_primary_button_disabled_text_color"; + // Background color of the secondary footer button String KEY_FOOTER_SECONDARY_BUTTON_BG_COLOR = "setup_compat_footer_secondary_button_bg_color"; @@ -246,6 +252,10 @@ public @interface PartnerConfigKey { String KEY_FOOTER_SECONDARY_BUTTON_MARGIN_START = "setup_compat_footer_secondary_button_margin_start"; + // Disabled text color of the secondary footer button + String KEY_SECONDARY_BUTTON_DISABLED_TEXT_COLOR = + "setup_compat_secondary_button_disabled_text_color"; + // Background color of layout String KEY_LAYOUT_BACKGROUND_COLOR = "setup_design_layout_bg_color"; @@ -502,6 +512,10 @@ public @interface PartnerConfigKey { // A height of the header of loading layout. String KEY_LOADING_LAYOUT_HEADER_HEIGHT = "loading_layout_header_height"; + // Use the fullscreen style lottie animation. + String KEY_LOADING_LAYOUT_FULL_SCREEN_ILLUSTRATION_ENABLED = + "loading_layout_full_screen_illustration_enabled"; + // A margin top of the content frame of progress bar. String KEY_PROGRESS_BAR_MARGIN_TOP = "setup_design_progress_bar_margin_top"; |