summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-03-27 23:16:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-27 23:16:15 +0000
commit40b55b1d3384d96e58404fed946b0f94b685efeb (patch)
treed8cdb67a7b199d5aee15dc6fcefe3310ae79c2d4 /res
parent1e63f8434c643bd7f3bf3390ef3ad14259e09923 (diff)
parentfd05a78a0370b1808d1d3f4e3620c055ef01b86d (diff)
downloadpackages_apps_Settings-40b55b1d3384d96e58404fed946b0f94b685efeb.zip
packages_apps_Settings-40b55b1d3384d96e58404fed946b0f94b685efeb.tar.gz
packages_apps_Settings-40b55b1d3384d96e58404fed946b0f94b685efeb.tar.bz2
Merge "Fix switch bar theme, clean up text appearances"
Diffstat (limited to 'res')
-rw-r--r--res/values/styles.xml31
-rw-r--r--res/values/themes.xml8
2 files changed, 12 insertions, 27 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a1a596e..8d0b885 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -306,10 +306,7 @@
<item name="android:singleLine">true</item>
</style>
- <style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Material.Small">
- <item name="android:textAllCaps">true</item>
- <item name="android:textStyle">bold</item>
- </style>
+ <style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Material.Widget.TabWidget" />
<style name="KeyguardAppWidgetItem">
<item name="android:textSize">18sp</item>
@@ -326,30 +323,18 @@
<item name="android:widgetLayout">@*android:layout/preference_widget_switch</item>
</style>
- <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium">
- </style>
-
- <style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small">
- </style>
-
- <style name="TextAppearance.Switch" parent="TextAppearance.Medium">
- </style>
+ <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium" />
+ <style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small" />
+ <style name="TextAppearance.Switch" parent="@android:style/TextAppearance.Material.Title" />
<style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Body2">
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
- <style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Medium">
- </style>
-
- <style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Material.Small">
- </style>
-
- <style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle">
- </style>
-
- <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle">
- </style>
+ <style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Subhead" />
+ <style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Material.Body1" />
+ <style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle" />
+ <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle" />
<style name="TextAppearance.FingerprintTitle"
parent="android:TextAppearance.Material.Large.Inverse">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b569004..48c5457 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -126,7 +126,7 @@
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
<item name="@*android:actionBarSize">@dimen/actionbar_size</item>
- <item name="switchBarTheme">@style/Theme.SwitchBar.Settings</item>
+ <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
@@ -143,7 +143,7 @@
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
- <item name="switchBarTheme">@style/Theme.SwitchBar.SubSettings</item>
+ <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.SubSettings</item>
</style>
<style name="Theme.ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid">
@@ -154,12 +154,12 @@
<item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
</style>
- <style name="Theme.SwitchBar.Settings" parent="@android:style/Theme.Material.Settings">
+ <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
<item name="switchBarMarginStart">@dimen/switchbar_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_margin_end</item>
</style>
- <style name="Theme.SwitchBar.SubSettings" parent="@android:style/Theme.Material.Settings">
+ <style name="ThemeOverlay.SwitchBar.SubSettings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
</style>