diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-12-08 01:35:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-08 01:35:51 +0000 |
commit | 2cf8aac5ece3b4afbe7d0cafd7b97c98457f2f49 (patch) | |
tree | df52a75f31b849ff68089739cce95e9fb1388ed7 | |
parent | ea74a79e8ebf89f2eb73ac6125254a22dbfb06da (diff) | |
parent | 8d5b2f2f75b634fd96702356a0ede78df0aa955f (diff) | |
download | setupcompat-2cf8aac5ece3b4afbe7d0cafd7b97c98457f2f49.tar.gz |
Import updated Android SetupCompat Library 414585234 am: 03695dcf72 am: 8d5b2f2f75
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/16413662
Change-Id: Id29fa0eb495f4fb51fd5969e0518d01b88de7ca8
4 files changed, 12 insertions, 3 deletions
diff --git a/main/java/com/google/android/setupcompat/portal/NotificationComponent.java b/main/java/com/google/android/setupcompat/portal/NotificationComponent.java index a90963b..c5865fe 100644 --- a/main/java/com/google/android/setupcompat/portal/NotificationComponent.java +++ b/main/java/com/google/android/setupcompat/portal/NotificationComponent.java @@ -76,6 +76,7 @@ public class NotificationComponent implements Parcelable { @Retention(RetentionPolicy.SOURCE) @IntDef({ + NotificationType.UNKNOWN, NotificationType.INITIAL_ONGOING, NotificationType.PREDEFERRED, NotificationType.PREDEFERRED_PREPARING, diff --git a/main/java/com/google/android/setupcompat/util/BuildCompatUtils.java b/main/java/com/google/android/setupcompat/util/BuildCompatUtils.java index 540047f..5b7c3ad 100644 --- a/main/java/com/google/android/setupcompat/util/BuildCompatUtils.java +++ b/main/java/com/google/android/setupcompat/util/BuildCompatUtils.java @@ -66,11 +66,11 @@ public final class BuildCompatUtils { * <li>For next Android release (CODENAME = "U", SDK_INT = 34+) * </ul> * - * <p>Note that Build.VERSION_CODES.S cannot be used here until final SDK is available in all - * Google3 channels, because it is equal to Build.VERSION_CODES.CUR_DEVELOPMENT before API + * <p>Note that Build.VERSION_CODES.T cannot be used here until final SDK is available in all + * channels, because it is equal to Build.VERSION_CODES.CUR_DEVELOPMENT before API * finalization. * - * @return Whether the current OS version is higher or equal to S. + * @return Whether the current OS version is higher or equal to T. */ public static boolean isAtLeastT() { if (!isAtLeastS()) { diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java index a9cd4a0..442e86c 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java @@ -169,6 +169,10 @@ public enum PartnerConfig { // Margin end of the layout CONFIG_LAYOUT_MARGIN_END(PartnerConfigKey.KEY_LAYOUT_MARGIN_END, ResourceType.DIMENSION), + // Middle horizontal spacing of the landscape layout + CONFIG_LAND_MIDDLE_HORIZONTAL_SPACING( + PartnerConfigKey.KEY_LAND_MIDDLE_HORIZONTAL_SPACING, ResourceType.DIMENSION), + // Text color of the header CONFIG_HEADER_TEXT_COLOR(PartnerConfigKey.KEY_HEADER_TEXT_COLOR, ResourceType.COLOR), diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java index b6a3302..cbf72f5 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java @@ -63,6 +63,7 @@ import java.lang.annotation.RetentionPolicy; PartnerConfigKey.KEY_LAYOUT_BACKGROUND_COLOR, PartnerConfigKey.KEY_LAYOUT_MARGIN_START, PartnerConfigKey.KEY_LAYOUT_MARGIN_END, + PartnerConfigKey.KEY_LAND_MIDDLE_HORIZONTAL_SPACING, PartnerConfigKey.KEY_HEADER_TEXT_SIZE, PartnerConfigKey.KEY_HEADER_TEXT_COLOR, PartnerConfigKey.KEY_HEADER_FONT_FAMILY, @@ -265,6 +266,9 @@ public @interface PartnerConfigKey { // Margin end of the layout String KEY_LAYOUT_MARGIN_END = "setup_design_layout_margin_end"; + // Middle horizontal spacing of the landscape layout + String KEY_LAND_MIDDLE_HORIZONTAL_SPACING = "setup_design_land_middle_horizontal_spacing"; + // Text size of the header String KEY_HEADER_TEXT_SIZE = "setup_design_header_text_size"; |