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

Merge "Fix switch bar theme, clean up text appearances"

Browse Source
This commit is contained in:
Alan Viverette
2015-03-27 23:16:14 +00:00
committed by Android (Google) Code Review
parent 1e63f8434c fd05a78a03
commit 40b55b1d33
2 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/values/styles.xml
View File

@@ -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">

8
res/values/themes.xml
View File

@@ -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>