PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d4988442: Point to Material.Settings themes

Browse Source 
* commit 'd4988442cbdf287e9856c3c00dad662e1ab36d2b':
  Point to Material.Settings themes
This commit is contained in:
Alan Viverette
2015-04-27 23:43:58 +00:00
committed by Android Git Automerger
parent 80848e20fc d4988442cb
commit fb7827f3be
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/themes.xml
View File

@@ -152,7 +152,7 @@
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
</style>
<style name="Theme.DialogWhenLarge" parent="@android:style/Theme.Material.DayNight.DialogWhenLarge">
<style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
@@ -178,7 +178,7 @@
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
</style>
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.DayNight.Dialog.Alert">
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
@@ -220,7 +220,7 @@
<item name="@*android:errorColor">@color/lock_pattern_view_error_color</item>
</style>
<style name="Theme.FingerprintEnroll" parent="@android:style/Theme.Material.Light.NoActionBar">
<style name="Theme.FingerprintEnroll" parent="@*android:style/Theme.Material.Settings.NoActionBar">
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
</style>