diff options
| author | Alan Viverette <alanv@google.com> | 2014-07-28 16:29:58 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-07-29 00:06:20 +0000 |
| commit | 744c6b22513f3b51f035b2038a59d35c97c4da6c (patch) | |
| tree | 71862eb84eb52c1b2d6d9e102e3beb5a0c0a3913 | |
| parent | c4108655e114631cf71b4f505357936e53469fe4 (diff) | |
| download | packages_apps_Settings-744c6b22513f3b51f035b2038a59d35c97c4da6c.tar.gz packages_apps_Settings-744c6b22513f3b51f035b2038a59d35c97c4da6c.tar.bz2 packages_apps_Settings-744c6b22513f3b51f035b2038a59d35c97c4da6c.zip | |
Remove TimePicker and DatePicker dialog themes
Also moves TimePicker widget style to appropriate XML file / namespace.
BUG: 14973897
Change-Id: I0eb68a59d8f2800d37cc949c948689d47c34486f
| -rw-r--r-- | res/values/styles.xml | 3 | ||||
| -rw-r--r-- | res/values/themes.xml | 19 |
2 files changed, 4 insertions, 18 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 3be3d09db..566748af4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -326,5 +326,8 @@ <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle"> </style> + <style name="Widget.TimePicker" parent="@*android:style/Widget.Material.Light.TimePicker"> + <item name="@android:numbersBackgroundColor">@android:color/white</item> + </style> </resources> diff --git a/res/values/themes.xml b/res/values/themes.xml index cc2a48085..ed743086f 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -105,8 +105,7 @@ <item name="@*android:errorColor">@color/lock_pattern_view_error_color</item> <!-- For the TimePicker --> - <item name="@android:timePickerDialogTheme">@style/Theme.TimePicker</item> - <item name="@android:timePickerStyle">@style/Theme.TimePickerStyle</item> + <item name="@android:timePickerStyle">@style/Widget.TimePicker</item> </style> <style name="Theme.SubSettings" parent="Theme.Settings"> @@ -188,22 +187,6 @@ <item name="preferenceBackgroundColor">@android:color/transparent</item> </style> - <style name="Theme.TimePicker" parent="@*android:style/Theme.Material.Light.Dialog.TimePicker"> - <!-- Used by the ActionBar --> - <item name="android:colorPrimary">@color/theme_primary</item> - <!-- Used by the StatusBar --> - <item name="android:colorPrimaryDark">@color/theme_primary_dark</item> - <!-- Used by controls, e.g. CheckBox, ProgressBar, etc. --> - <item name="android:colorAccent">@color/theme_accent</item> - - <!-- Redefine the ActionBar style for contentInsetStart --> - <item name="android:actionBarStyle">@style/Theme.ActionBar</item> - </style> - - <style name="Theme.TimePickerStyle" parent="@*android:style/Widget.Material.Light.TimePicker"> - <item name="@android:numbersBackgroundColor">@android:color/white</item> - </style> - <!-- Used to color the switch bar controls --> <style name="ThemeOverlay.SwitchBar" parent="@android:style/ThemeOverlay"> <!-- Used by controls, e.g. CheckBox, ProgressBar, etc. --> |