diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2023-10-30 08:39:09 +0000 |
---|---|---|
committer | Pihuei Wang <pihuei@google.com> | 2023-11-13 00:44:57 +0000 |
commit | 5329c002994a0339d8a21dd5e80f0805dfc79944 (patch) | |
tree | 58cfc8ccf28a1252ba7fa67ec362d905725af21f | |
parent | 94b888e1586d8ae20ba615cb9a6bdff27b0652dc (diff) | |
download | setupcompat-5329c002994a0339d8a21dd5e80f0805dfc79944.tar.gz |
Import updated Android SetupCompat Library 577757011
Copied from google3/third_party/java_src/android_libs/setupcompat
Bug:278492246
Test: mm
Included changes:
- 577757011 [SetupLibrary] Create a partner config for sud_content_il...
PiperOrigin-RevId: 577757011
Change-Id: Id51dab308ea8b76e335226d555f6b327f6de281e
4 files changed, 20 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ccd7122..cae5fe3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -15,9 +15,7 @@ limitations under the License. --> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.android.setupcompat" > +<manifest package="com.google.android.setupcompat"> <!-- Set in the BUILD or gradle file --> - <uses-sdk - android:minSdkVersion="19" /> + <uses-sdk /> </manifest> diff --git a/exempting_lint_checks.txt b/exempting_lint_checks.txt index 4129b20..08ba928 100644 --- a/exempting_lint_checks.txt +++ b/exempting_lint_checks.txt @@ -15,3 +15,14 @@ third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setup third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/template/FooterButtonStyleUtils.java: NewApi: FooterButtonStyleUtils.updateButtonRippleColorWithPartnerConfig( third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/util/SystemBarHelper.java: AnnotateVersionCheck: public static void setImeInsetView(final View view) { third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/view/StatusBarBackgroundLayout.java: ObsoleteSdkInt: @TargetApi(VERSION_CODES.HONEYCOMB) +third_party/java_src/android_libs/setupcompat/AndroidManifest.xml: ExpiringTargetSdkVersion: <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="31" /> +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/PartnerCustomizationLayout.java: CustomViewStyleable: attrs, R.styleable.SucPartnerCustomizationLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/PartnerCustomizationLayout.java: ObsoleteSdkInt: @TargetApi(VERSION_CODES.HONEYCOMB) +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/internal/TemplateLayout.java: CustomViewStyleable: getContext().obtainStyledAttributes(attrs, R.styleable.SucTemplateLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/internal/TemplateLayout.java: ObsoleteSdkInt: @TargetApi(VERSION_CODES.HONEYCOMB) +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/logging/internal/MetricBundleConverter.java: NewApi: bundle.putParcelable(MetricBundleKeys.CUSTOM_EVENT_BUNDLE, CustomEvent.toBundle(customEvent)); +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/template/FooterBarMixin.java: NewApi: onFooterButtonApplyPartnerResource(button, footerButtonPartnerConfig); +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/template/FooterButtonStyleUtils.java: NewApi: FooterButtonStyleUtils.updateButtonBackgroundWithPartnerConfig( +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/template/FooterButtonStyleUtils.java: NewApi: FooterButtonStyleUtils.updateButtonRippleColorWithPartnerConfig( +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/util/SystemBarHelper.java: AnnotateVersionCheck: public static void setImeInsetView(final View view) { +third_party/java_src/android_libs/setupcompat/main/java/com/google/android/setupcompat/view/StatusBarBackgroundLayout.java: ObsoleteSdkInt: @TargetApi(VERSION_CODES.HONEYCOMB) diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java index 4f752d7..03e9bb5 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java @@ -206,6 +206,10 @@ public enum PartnerConfig { // Size of the icon CONFIG_ICON_SIZE(PartnerConfigKey.KEY_ICON_SIZE, ResourceType.DIMENSION), + // The max width of the illustration + CONFIG_ILLUSTRATION_MAX_WIDTH( + PartnerConfigKey.KEY_ILLUSTRATION_MAX_WIDTH, ResourceType.DIMENSION), + // Background color of the header area CONFIG_HEADER_AREA_BACKGROUND_COLOR( PartnerConfigKey.KEY_HEADER_AREA_BACKGROUND_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 1dca0cd..1dac81f 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java @@ -81,6 +81,7 @@ import java.lang.annotation.RetentionPolicy; PartnerConfigKey.KEY_LAYOUT_GRAVITY, PartnerConfigKey.KEY_ICON_MARGIN_TOP, PartnerConfigKey.KEY_ICON_SIZE, + PartnerConfigKey.KEY_ILLUSTRATION_MAX_WIDTH, PartnerConfigKey.KEY_DESCRIPTION_TEXT_SIZE, PartnerConfigKey.KEY_DESCRIPTION_TEXT_COLOR, PartnerConfigKey.KEY_DESCRIPTION_LINK_TEXT_COLOR, @@ -307,6 +308,8 @@ public @interface PartnerConfigKey { // Size of the icon String KEY_ICON_SIZE = "setup_design_icon_size"; + String KEY_ILLUSTRATION_MAX_WIDTH = "setup_design_illustration_max_width"; + // Background color of the header area String KEY_HEADER_AREA_BACKGROUND_COLOR = "setup_design_header_area_background_color"; |