From 03695dcf72d22cbbc93d1ae08307c3e9ff0557a2 Mon Sep 17 00:00:00 2001 From: Setup Wizard Team Date: Tue, 7 Dec 2021 09:47:48 +0800 Subject: Import updated Android SetupCompat Library 414585234 Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Included changes: - 414585234 Reduce portal log, and unnecessary function call. - 412452022 [Setupcompat] update the comment for SDK checking - 412250860 Add partner config for the middle space of 2-column layou... Bug: 205781866 PiperOrigin-RevId: 414585234 Change-Id: Ife565ede7fe4b86c8c854fc62d4b042b777dd226 --- .../google/android/setupcompat/portal/NotificationComponent.java | 1 + main/java/com/google/android/setupcompat/util/BuildCompatUtils.java | 6 +++--- .../com/google/android/setupcompat/partnerconfig/PartnerConfig.java | 4 ++++ .../google/android/setupcompat/partnerconfig/PartnerConfigKey.java | 4 ++++ 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 { *
  • For next Android release (CODENAME = "U", SDK_INT = 34+) * * - *

    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 + *

    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"; -- cgit v1.2.3