summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorSetup Wizard Team <android-setup-team-eng@google.com>2021-06-15 11:31:02 +0800
committerPasty Chang <pastychang@google.com>2021-06-16 03:20:55 +0000
commit649d1e8b9cdfeb2382d96cbc89fa58873cada13b (patch)
tree5cd97075ef5b12f5b8ac38f91136a417187cd061 /main
parent26e5d52bfea77f4f74f123f3409d513334ea23c3 (diff)
downloadsetupdesign-649d1e8b9cdfeb2382d96cbc89fa58873cada13b.tar.gz
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
Diffstat (limited to 'main')
-rw-r--r--main/res/drawable/sud_dialog_background_dark.xml2
-rw-r--r--main/res/drawable/sud_dialog_background_light.xml2
-rw-r--r--main/res/values-v31/styles.xml2
-rw-r--r--main/src/com/google/android/setupdesign/util/ThemeHelper.java2
-rw-r--r--main/src/com/google/android/setupdesign/view/IntrinsicSizeFrameLayout.java35
5 files changed, 40 insertions, 3 deletions
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">
<shape android:shape="rectangle">
- <corners android:radius="@dimen/sud_glif_alert_dialog_corner_radius" />
+ <corners android:radius="?attr/dialogCornerRadius" />
<solid android:color="@color/sud_glif_window_bg_dark_color" />
</shape>
</inset>
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">
<shape android:shape="rectangle">
- <corners android:radius="@dimen/sud_glif_alert_dialog_corner_radius" />
+ <corners android:radius="?attr/dialogCornerRadius" />
<solid android:color="@color/sud_glif_window_bg_light_color" />
</shape>
</inset>
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 @@
<!-- Dynamic color theme for date time dialog -->
<style name="SudDynamicColorDateTimePickerDialogTheme" parent="SudDateTimePickerDialogTheme">
<item name="colorAccent">@color/sud_dynamic_color_accent_glif_v3_dark</item>
+ <item name="dialogCornerRadius">@dimen/sud_glif_device_default_dialog_corner_radius</item>
</style>
<style name="SudDynamicColorDateTimePickerDialogTheme.Light" parent="SudDateTimePickerDialogTheme.Light">
<item name="colorAccent">@color/sud_dynamic_color_accent_glif_v3_light</item>
+ <item name="dialogCornerRadius">@dimen/sud_glif_device_default_dialog_corner_radius</item>
</style>
</resources>
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