From 649d1e8b9cdfeb2382d96cbc89fa58873cada13b Mon Sep 17 00:00:00 2001 From: Setup Wizard Team Date: Tue, 15 Jun 2021 11:31:02 +0800 Subject: Import updated Android Setupdesign Library 379405017 Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Bug: 190794282 Included changes: - 379405017 Print P100 for debug purpose - 379335714 Update Android Lint to google3 http://ab/7296657 - 378871011 [tablet] Add partner configs to set width/height of card ... - 378833256 Corner radius for datetime dialog - 378821634 [Tablet] Add card view style for waiting screen PiperOrigin-RevId: 379405017 Change-Id: Ia77ceff01508b8d1464d7edea824c7ec0a19f615 --- exempting_lint_checks.txt | 27 ++++++++++++ .../res/layout/sud_glif_loading_template_card.xml | 49 ++++++++++++++++++++++ .../res/values-sw600dp/layouts.xml | 20 +++++++++ main/res/drawable/sud_dialog_background_dark.xml | 2 +- main/res/drawable/sud_dialog_background_light.xml | 2 +- main/res/values-v31/styles.xml | 2 + .../android/setupdesign/util/ThemeHelper.java | 2 +- .../setupdesign/view/IntrinsicSizeFrameLayout.java | 35 ++++++++++++++++ 8 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 lottie_loading_layout/res/layout/sud_glif_loading_template_card.xml create mode 100644 lottie_loading_layout/res/values-sw600dp/layouts.xml diff --git a/exempting_lint_checks.txt b/exempting_lint_checks.txt index 5845928..201fd64 100644 --- a/exempting_lint_checks.txt +++ b/exempting_lint_checks.txt @@ -20,3 +20,30 @@ third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupd third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/NavigationBar.java: ResourceType: @StyleableRes int colorForeground = 1; third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/StickyHeaderListView.java: CustomViewStyleable: .obtainStyledAttributes(attrs, R.styleable.SudStickyHeaderListView, defStyleAttr, 0); third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/StickyHeaderScrollView.java: ObsoleteSdkInt: if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/GlifLayout.java: CustomViewStyleable: getContext().obtainStyledAttributes(attrs, R.styleable.SudGlifLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/SetupWizardLayout.java: CustomViewStyleable: .obtainStyledAttributes(attrs, R.styleable.SudSetupWizardLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java: NotifyDataSetChanged: notifyDataSetChanged(); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/FillContentLayout.java: CustomViewStyleable: context.obtainStyledAttributes(attrs, R.styleable.SudFillContentLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/HeaderRecyclerView.java: CustomViewStyleable: .obtainStyledAttributes(attrs, R.styleable.SudHeaderRecyclerView, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/HeaderRecyclerView.java: NotifyDataSetChanged: notifyDataSetChanged(); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/Illustration.java: CustomViewStyleable: getContext().obtainStyledAttributes(attrs, R.styleable.SudIllustration, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java: CustomViewStyleable: context.obtainStyledAttributes(attrs, R.styleable.SudIllustrationVideoView); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java: CustomViewStyleable: attrs, R.styleable.SudIntrinsicSizeFrameLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/NavigationBar.java: ResourceType: @StyleableRes int colorBackground = 2; +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/NavigationBar.java: ResourceType: @StyleableRes int colorForeground = 1; +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/StickyHeaderListView.java: CustomViewStyleable: .obtainStyledAttributes(attrs, R.styleable.SudStickyHeaderListView, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/StickyHeaderScrollView.java: ObsoleteSdkInt: if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/GlifLayout.java: CustomViewStyleable: getContext().obtainStyledAttributes(attrs, R.styleable.SudGlifLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/SetupWizardLayout.java: CustomViewStyleable: .obtainStyledAttributes(attrs, R.styleable.SudSetupWizardLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java: NotifyDataSetChanged: notifyDataSetChanged(); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/FillContentLayout.java: CustomViewStyleable: context.obtainStyledAttributes(attrs, R.styleable.SudFillContentLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/HeaderRecyclerView.java: CustomViewStyleable: .obtainStyledAttributes(attrs, R.styleable.SudHeaderRecyclerView, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/HeaderRecyclerView.java: NotifyDataSetChanged: notifyDataSetChanged(); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/IconUniformityAppImageView.java: AnnotateVersionCheck: private static final boolean ON_L_PLUS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/Illustration.java: CustomViewStyleable: getContext().obtainStyledAttributes(attrs, R.styleable.SudIllustration, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java: CustomViewStyleable: context.obtainStyledAttributes(attrs, R.styleable.SudIllustrationVideoView); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java: CustomViewStyleable: attrs, R.styleable.SudIntrinsicSizeFrameLayout, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/NavigationBar.java: ResourceType: @StyleableRes int colorBackground = 2; +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/NavigationBar.java: ResourceType: @StyleableRes int colorForeground = 1; +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/StickyHeaderListView.java: CustomViewStyleable: .obtainStyledAttributes(attrs, R.styleable.SudStickyHeaderListView, defStyleAttr, 0); +third_party/java_src/android_libs/setupdesign/main/src/com/google/android/setupdesign/view/StickyHeaderScrollView.java: ObsoleteSdkInt: if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { diff --git a/lottie_loading_layout/res/layout/sud_glif_loading_template_card.xml b/lottie_loading_layout/res/layout/sud_glif_loading_template_card.xml new file mode 100644 index 0000000..2db095c --- /dev/null +++ b/lottie_loading_layout/res/layout/sud_glif_loading_template_card.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + diff --git a/lottie_loading_layout/res/values-sw600dp/layouts.xml b/lottie_loading_layout/res/values-sw600dp/layouts.xml new file mode 100644 index 0000000..9fe5404 --- /dev/null +++ b/lottie_loading_layout/res/values-sw600dp/layouts.xml @@ -0,0 +1,20 @@ + + + + + @layout/sud_glif_loading_template_card + diff --git a/main/res/drawable/sud_dialog_background_dark.xml b/main/res/drawable/sud_dialog_background_dark.xml index 076200d..914cfec 100644 --- a/main/res/drawable/sud_dialog_background_dark.xml +++ b/main/res/drawable/sud_dialog_background_dark.xml @@ -24,7 +24,7 @@ android:insetRight="16dp" android:insetBottom="16dp"> - + diff --git a/main/res/drawable/sud_dialog_background_light.xml b/main/res/drawable/sud_dialog_background_light.xml index 14e9418..0302783 100644 --- a/main/res/drawable/sud_dialog_background_light.xml +++ b/main/res/drawable/sud_dialog_background_light.xml @@ -24,7 +24,7 @@ android:insetRight="16dp" android:insetBottom="16dp"> - + diff --git a/main/res/values-v31/styles.xml b/main/res/values-v31/styles.xml index b088f78..e1240e4 100644 --- a/main/res/values-v31/styles.xml +++ b/main/res/values-v31/styles.xml @@ -109,10 +109,12 @@ diff --git a/main/src/com/google/android/setupdesign/util/ThemeHelper.java b/main/src/com/google/android/setupdesign/util/ThemeHelper.java index ba2ca1d..0b750c9 100644 --- a/main/src/com/google/android/setupdesign/util/ThemeHelper.java +++ b/main/src/com/google/android/setupdesign/util/ThemeHelper.java @@ -229,7 +229,7 @@ public final class ThemeHelper { + colorIntToHex(context, R.color.sud_dynamic_color_accent_glif_v3_dark) + ", " + (BuildCompatUtils.isAtLeastS() - ? colorIntToHex(context, android.R.color.system_accent1_200) + ? colorIntToHex(context, android.R.color.system_accent1_100) : "n/a")); return resId; diff --git a/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java b/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java index 02ab6fc..d02839b 100644 --- a/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java +++ b/main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java @@ -21,7 +21,11 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.Build.VERSION_CODES; import android.util.AttributeSet; +import android.view.ViewGroup; import android.widget.FrameLayout; +import com.google.android.setupcompat.partnerconfig.PartnerConfig; +import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper; +import com.google.android.setupcompat.util.BuildCompatUtils; import com.google.android.setupdesign.R; /** @@ -66,6 +70,37 @@ public class IntrinsicSizeFrameLayout extends FrameLayout { intrinsicWidth = a.getDimensionPixelSize(R.styleable.SudIntrinsicSizeFrameLayout_android_width, 0); a.recycle(); + + if (BuildCompatUtils.isAtLeastS()) { + if (PartnerConfigHelper.get(context) + .isPartnerConfigAvailable(PartnerConfig.CONFIG_CARD_VIEW_INTRINSIC_HEIGHT)) { + intrinsicHeight = + (int) + PartnerConfigHelper.get(context) + .getDimension(context, PartnerConfig.CONFIG_CARD_VIEW_INTRINSIC_HEIGHT); + } + if (PartnerConfigHelper.get(context) + .isPartnerConfigAvailable(PartnerConfig.CONFIG_CARD_VIEW_INTRINSIC_WIDTH)) { + intrinsicWidth = + (int) + PartnerConfigHelper.get(context) + .getDimension(context, PartnerConfig.CONFIG_CARD_VIEW_INTRINSIC_WIDTH); + } + } + } + + @Override + public void setLayoutParams(ViewGroup.LayoutParams params) { + if (BuildCompatUtils.isAtLeastS()) { + // When both intrinsic height and width are 0, the card view style would be removed from + // foldable/tablet layout. It must set the layout width and height to MATCH_PARENT and then it + // can ignore the IntrinsicSizeFrameLayout from the foldable/tablet layout. + if (intrinsicHeight == 0 && intrinsicWidth == 0) { + params.width = ViewGroup.LayoutParams.MATCH_PARENT; + params.height = ViewGroup.LayoutParams.MATCH_PARENT; + } + } + super.setLayoutParams(params); } @Override -- cgit v1.2.3