diff options
| author | Kunhung Li <kunhungli@google.com> | 2019-05-27 18:28:58 +0800 |
|---|---|---|
| committer | Kunhung Li <kunhungli@google.com> | 2019-05-29 11:53:17 +0800 |
| commit | 2247316d60eacf0a89f4cb5b9b6650337e10c97c (patch) | |
| tree | 7c506a088879268683e1fc36c2803cebf6476c6d /res/values/styles.xml | |
| parent | 7de69e1710bb7eca38c80e8d7b0056b77c38d855 (diff) | |
| download | android_packages_wallpapers_LivePicker-2247316d60eacf0a89f4cb5b9b6650337e10c97c.tar.gz android_packages_wallpapers_LivePicker-2247316d60eacf0a89f4cb5b9b6650337e10c97c.tar.bz2 android_packages_wallpapers_LivePicker-2247316d60eacf0a89f4cb5b9b6650337e10c97c.zip | |
Support the dark mode in LivePicker
1.Change to apply AppCompat theme instead of material.
2.Change panel and button to support in dark theme.
Bug: 133480634
Test: Manual test
Change-Id: Ib036fbe49496c36f3ccecae99c857ad201f68084
Diffstat (limited to 'res/values/styles.xml')
| -rw-r--r-- | res/values/styles.xml | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index c0705b2..abec6c0 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -21,7 +21,7 @@ <style name="LivePickerTheme" parent="@android:style/Theme.DeviceDefault.Settings"/> - <style name="Preview" parent="@style/Theme.MaterialComponents.NoActionBar"> + <style name="Preview" parent="@style/Theme.AppCompat.NoActionBar"> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowContentOverlay">@null</item> <item name="android:windowDisablePreview">true</item> @@ -30,11 +30,10 @@ <item name="android:statusBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@color/translucent_black</item> - <item name="android:colorAccent">@*android:color/accent_device_default_light</item> - <item name="colorAccent">@*android:color/accent_device_default_light</item> + <!-- Button corner --> + <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item> - <item name="colorPrimary">@*android:color/accent_device_default_light</item> - <item name="colorOnPrimary">@*android:color/primary_device_default_light</item> + <item name="colorAccent">@*android:color/accent_device_default</item> </style> <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> @@ -55,17 +54,23 @@ <style name="AlertDialogStyle" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"/> - <style name="ButtonStyle" parent="@style/Widget.MaterialComponents.Button"> + <style name="ButtonStyle.Base" parent="@style/Widget.AppCompat.Button.Colored"> + <item name="android:background">@drawable/btn_colored_background</item> <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.Button</item> - <item name="android:textColor">?android:textColorPrimary</item> <item name="android:textAllCaps">false</item> + <item name="android:padding">@dimen/preview_attribution_pane_button_padding</item> + <item name="android:minHeight">@dimen/preview_attribution_pane_button_height</item> + <item name="android:singleLine">true</item> + <item name="android:ellipsize">end</item> </style> - <style name="OutlinedButtonStyle" parent="@style/Widget.MaterialComponents.Button.OutlinedButton"> - <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.Button</item> + <style name="ButtonStyle" parent="@style/ButtonStyle.Base"> + <item name="android:textColor">?android:textColorPrimary</item> + </style> + + <style name="OutlinedButtonStyle" parent="@style/ButtonStyle"> + <item name="android:background">@drawable/btn_transparent</item> <item name="android:textColor">?android:textColorPrimary</item> - <item name="android:textAllCaps">false</item> - <item name="strokeColor">@*android:color/primary_device_default_light</item> </style> <style name="WallpaperSliceStyle" parent="@style/Widget.SliceView"> |