diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-05-05 20:25:33 +0800 |
|---|---|---|
| committer | Cating Lin <catinglin@google.com> | 2021-05-11 09:55:15 +0800 |
| commit | d77ab242a37188333aa7f74eb3d3486a8e0f200d (patch) | |
| tree | 207692f7699ca2f9ba84ea76a3199e6484696f55 /partnerconfig | |
| parent | 3a3ac684efa87a429da09c1683d6086c6ef2aa5a (diff) | |
| download | setupcompat-d77ab242a37188333aa7f74eb3d3486a8e0f200d.tar.gz | |
Import updated Android SetupCompat Library 372106188
Copied from google3/third_party/java_src/android_libs/setupcompat
Test: mm
Bug: 185574209
Included changes:
- 372106188 [GlifLoadingLayout] Add header height partner resources f...
- 372076516 Make the left padding equal to the right one for a second...
- 372059173 Allow to create a secondary button in a primary style.
PiperOrigin-RevId: 372106188
Change-Id: If8c74d33ccdd4ca4e3c3dbb89134261ebdea77a5
Diffstat (limited to 'partnerconfig')
| -rw-r--r-- | partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java | 6 | ||||
| -rw-r--r-- | partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java | 4 |
2 files changed, 9 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 439dea2..c10055e 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java @@ -402,7 +402,11 @@ public enum PartnerConfig { // The padding bottom of the content frame of loading layout. CONFIG_LOADING_LAYOUT_PADDING_BOTTOM( - PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_BOTTOM, ResourceType.DIMENSION); + PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_BOTTOM, ResourceType.DIMENSION), + + // The height of the header of the loading layout. + CONFIG_LOADING_LAYOUT_HEADER_HEIGHT( + PartnerConfigKey.KEY_LOADING_LAYOUT_HEADER_HEIGHT, 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 8a775ec..a810908 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java @@ -125,6 +125,7 @@ import java.lang.annotation.RetentionPolicy; PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_START, PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_END, PartnerConfigKey.KEY_LOADING_LAYOUT_CONTENT_PADDING_BOTTOM, + PartnerConfigKey.KEY_LOADING_LAYOUT_HEADER_HEIGHT, }) // TODO: can be removed and always reference PartnerConfig.getResourceName()? @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) @@ -462,4 +463,7 @@ public @interface PartnerConfigKey { // A padding bottom of the content frame of loading layout. String KEY_LOADING_LAYOUT_CONTENT_PADDING_BOTTOM = "loading_layout_content_padding_bottom"; + + // A height of the header of loading layout. + String KEY_LOADING_LAYOUT_HEADER_HEIGHT = "loading_layout_header_height"; } |