diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-09 00:07:26 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-09 00:07:26 +0000 |
commit | 13644ae60092b3469c81dad57d58520916f7cb60 (patch) | |
tree | df52a75f31b849ff68089739cce95e9fb1388ed7 | |
parent | f7e0b88661282877a0440d395991ac416f102a5c (diff) | |
parent | 03695dcf72d22cbbc93d1ae08307c3e9ff0557a2 (diff) | |
download | setupcompat-android12L-s1-release.tar.gz |
Snap for 7981408 from 03695dcf72d22cbbc93d1ae08307c3e9ff0557a2 to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-release
Change-Id: If7510104ef1c651a0f1bf97a377dc44741256a81
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"; |