diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-05-03 18:51:27 +0800 |
---|---|---|
committer | Cn Chen <cnchen@google.com> | 2021-05-04 06:52:07 +0000 |
commit | 3a3ac684efa87a429da09c1683d6086c6ef2aa5a (patch) | |
tree | 097c875c047b9ead3880f158234ed3cef8535fca | |
parent | 8a37aa87d329998a8e65ee78db28d33fec14ba82 (diff) | |
download | setupcompat-3a3ac684efa87a429da09c1683d6086c6ef2aa5a.tar.gz |
Import updated Android SetupCompat Library 371667272
Copied from google3/third_party/java_src/android_libs/setupcompat
Test: mm
Bug: 182870319
Bug: 185557130
Included changes:
- 371667272 Add API for ChimeraActivity
- 371663526 Migrate android.support.annotation.IntDef to androidx.ann...
- 371648106 [GlifLoadingLayout] Add padding partner resources for con...
- 371036375 [Portal] Set default reregister timeout as 0, and will be...
- 370823989 [Portal] Add field, timeout for wait client reregister, ...
PiperOrigin-RevId: 371667272
Change-Id: Id108a8f6d337597cc1802686492ba57ddb0d33cb
3 files changed, 34 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 a78e345..439dea2 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java @@ -386,7 +386,23 @@ public enum PartnerConfig { // The list of keypath and color map, applied to final hold animation when dark theme. CONFIG_LOTTIE_DARK_THEME_CUSTOMIZATION_FINAL_HOLD( - PartnerConfigKey.KEY_LOADING_DARK_THEME_CUSTOMIZATION_FINAL_HOLD, ResourceType.STRING_ARRAY); + PartnerConfigKey.KEY_LOADING_DARK_THEME_CUSTOMIZATION_FINAL_HOLD, ResourceType.STRING_ARRAY), + + // The padding top of the content frame of loading layout. + CONFIG_LOADING_LAYOUT_PADDING_TOP( + PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_TOP, ResourceType.DIMENSION), + + // The padding start of the content frame of loading layout. + CONFIG_LOADING_LAYOUT_PADDING_START( + PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_START, ResourceType.DIMENSION), + + // The padding end of the content frame of loading layout. + CONFIG_LOADING_LAYOUT_PADDING_END( + PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_END, ResourceType.DIMENSION), + + // The padding bottom of the content frame of loading layout. + CONFIG_LOADING_LAYOUT_PADDING_BOTTOM( + PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_BOTTOM, ResourceType.DIMENSION); /** Resource type of the partner resources type. */ public enum ResourceType { diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java index dd43989..2ca8876 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java @@ -607,7 +607,7 @@ public class PartnerConfigHelper { } /** Returns true if the SetupWizard supports the dynamic color during setup flow. */ - public static boolean shouldApplyDynamicColor(@NonNull Context context) { + public static boolean isSetupWizardDynamicColorEnabled(@NonNull Context context) { if (applyDynamicColorBundle == null) { try { applyDynamicColorBundle = diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java index 22cd526..8a775ec 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java @@ -121,6 +121,10 @@ import java.lang.annotation.RetentionPolicy; PartnerConfigKey.KEY_LOADING_DARK_THEME_CUSTOMIZATION_UPDATE, PartnerConfigKey.KEY_LOADING_DARK_THEME_CUSTOMIZATION_FINAL_HOLD, PartnerConfigKey.KEY_TRANSITION_TYPE, + PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_TOP, + PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_START, + PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_END, + PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_BOTTOM, }) // TODO: can be removed and always reference PartnerConfig.getResourceName()? @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) @@ -446,4 +450,16 @@ public @interface PartnerConfigKey { // The transition type between activities String KEY_TRANSITION_TYPE = "setup_design_transition_type"; + + // A padding top of the content frame of loading layout. + String KEY_LOADING_LAYOUT_CONTENT_PADDING_TOP = "loading_layout_content_padding_top"; + + // A padding start of the content frame of loading layout. + String KEY_LOADING_LAYOUT_CONTENT_PADDING_START = "loading_layout_content_padding_start"; + + // A padding end of the content frame of loading layout. + String KEY_LOADING_LAYOUT_CONTENT_PADDING_END = "loading_layout_content_padding_end"; + + // A padding bottom of the content frame of loading layout. + String KEY_LOADING_LAYOUT_CONTENT_PADDING_BOTTOM = "loading_layout_content_padding_bottom"; } |