Merge "Adjust the set wallpaper dialog UI" into sc-dev am: e68f367a4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/15142882
Change-Id: I35e63f19e87b1bb20e8a6769b6c88a627cc217fa
diff --git a/res/layout/dialog_set_wallpaper.xml b/res/layout/dialog_set_wallpaper.xml
index 81d6253..f1102bd 100755
--- a/res/layout/dialog_set_wallpaper.xml
+++ b/res/layout/dialog_set_wallpaper.xml
@@ -19,6 +19,7 @@
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="?androidprv:attr/colorSurface"
android:padding="@dimen/set_wallpaper_dialog_padding">
<LinearLayout
diff --git a/res/layout/dialog_set_wallpaper_title.xml b/res/layout/dialog_set_wallpaper_title.xml
index 9332021..3267939 100755
--- a/res/layout/dialog_set_wallpaper_title.xml
+++ b/res/layout/dialog_set_wallpaper_title.xml
@@ -14,8 +14,10 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:background="?androidprv:attr/colorSurface"
android:orientation="vertical">
<Space
@@ -36,9 +38,15 @@
<TextView
android:id="@+id/dialog_set_wallpaper_title"
android:layout_width="match_parent"
- android:layout_height="64dp"
+ android:layout_height="wrap_content"
+ android:fontFamily="@*android:string/config_headlineFontFamily"
+ android:minHeight="32dp"
android:textColor="?android:attr/textColorPrimary"
android:textSize="24sp"
android:gravity="center" />
+ <Space
+ android:layout_height="8dp"
+ android:layout_width="wrap_content" />
+
</LinearLayout>
diff --git a/res/values-notnight-v27/styles.xml b/res/values-notnight-v27/styles.xml
index 72098f6..95c5ee5 100755
--- a/res/values-notnight-v27/styles.xml
+++ b/res/values-notnight-v27/styles.xml
@@ -44,5 +44,8 @@
<style name="LightDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">
<item name="android:layout">@layout/abc_alert_dialog_material</item>
<item name="windowActionBar">false</item>
+ <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
+ <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
+ <item name="android:dialogCornerRadius">24dp</item>
</style>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 09fe893..8e13fb0 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -89,7 +89,7 @@
<dimen name="set_wallpaper_dialog_item_min_width">300dp</dimen>
<dimen name="set_wallpaper_dialog_item_outer_corner_radius">12dp</dimen>
<dimen name="set_wallpaper_dialog_item_inner_corner_radius">4dp</dimen>
- <dimen name="set_wallpaper_dialog_icon_size">24dp</dimen>
+ <dimen name="set_wallpaper_dialog_icon_size">32dp</dimen>
<!-- Dimensions for the "wallpaper disabled by administrator" UI. -->
<dimen name="wallpaper_disabled_asset_margin_bottom">26dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 051ca4b..071792b 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -88,6 +88,9 @@
<style name="LightDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">
<item name="android:layout">@layout/abc_alert_dialog_material</item>
<item name="windowActionBar">false</item>
+ <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
+ <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
+ <item name="android:dialogCornerRadius">24dp</item>
</style>
<style name="ProgressDialogThemePreL" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
@@ -140,7 +143,7 @@
<!-- Studio can't directly reference ?androidprv:attr/textColorOnAccent here,
so we set the text color on the dialog items instead. -->
<style name="set_wallpaper_destination_item">
- <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
<item name="android:minHeight">@dimen/set_wallpaper_dialog_item_min_height</item>
<item name="android:minWidth">@dimen/set_wallpaper_dialog_item_min_width</item>
<item name="android:textAlignment">center</item>