diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-08-10 10:13:57 +0800 |
|---|---|---|
| committer | Cn Chen <cnchen@google.com> | 2021-08-10 03:47:51 +0000 |
| commit | 8ca664e16cb804c526cd9586e6d3705ad03b506f (patch) | |
| tree | c1724eeeeb444cbdc346ebfa8fe878fbfda4605d | |
| parent | 4098a67a639a492ad1b305c80eaab50244088f31 (diff) | |
| download | setupcompat-8ca664e16cb804c526cd9586e6d3705ad03b506f.tar.gz | |
Import updated Android SetupCompat Library 389778265
Copied from google3/third_party/java_src/android_libs/setupcompat
Test: mm
Included changes:
- 389778265 Make progressbar margin support partner config.
Bug: 191221238
PiperOrigin-RevId: 389778265
Change-Id: I29e0a55e204f04cd117dd4574bbe0d91a4be114b
| -rw-r--r-- | partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java | 10 | ||||
| -rw-r--r-- | partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java index fbbca4d..0e3c6a3 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java @@ -434,7 +434,15 @@ public enum PartnerConfig { // The height of the header of the loading layout. CONFIG_LOADING_LAYOUT_HEADER_HEIGHT( - PartnerConfigKey.KEY_LOADING_LAYOUT_HEADER_HEIGHT, ResourceType.DIMENSION); + PartnerConfigKey.KEY_LOADING_LAYOUT_HEADER_HEIGHT, ResourceType.DIMENSION), + + // The margin top of progress bar. + CONFIG_PROGRESS_BAR_MARGIN_TOP( + PartnerConfigKey.KEY_PROGRESS_BAR_MARGIN_TOP, ResourceType.DIMENSION), + + // The margin bottom of progress bar. + CONFIG_PROGRESS_BAR_MARGIN_BOTTOM( + PartnerConfigKey.KEY_PROGRESS_BAR_MARGIN_BOTTOM, ResourceType.DIMENSION); /** Resource type of the partner resources type. */ public enum ResourceType { diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java index 8cb8e69..a3df178 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java @@ -133,6 +133,8 @@ 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_PROGRESS_BAR_MARGIN_TOP, + PartnerConfigKey.KEY_PROGRESS_BAR_MARGIN_BOTTOM, }) // TODO: can be removed and always reference PartnerConfig.getResourceName()? @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) @@ -495,4 +497,10 @@ public @interface PartnerConfigKey { // A height of the header of loading layout. String KEY_LOADING_LAYOUT_HEADER_HEIGHT = "loading_layout_header_height"; + + // A margin top of the content frame of progress bar. + String KEY_PROGRESS_BAR_MARGIN_TOP = "progress_bar_margin_top"; + + // A margin bottom of the content frame of progress bar. + String KEY_PROGRESS_BAR_MARGIN_BOTTOM = "progress_bar_margin_bottom"; } |