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

DO NOT MERGE Material theme

Browse Source 
BUG; 15467097
Change-Id: Ifeda3f6cc1554c4d31357d5010df6958113df964
This commit is contained in:
Alan Viverette
2014-06-06 14:33:10 -07:00
parent b76de1d4fa
commit 5c8f1352e4
10 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/values/colors.xml
View File

@@ -47,27 +47,27 @@
<color name="lock_pattern_view_success_color">#ff009688</color>
<color name="lock_pattern_view_error_color">#fff4511e</color>
<color name="quantum_blue_grey_50">#ffeceff1</color>
<color name="quantum_blue_grey_100">#ffcfd8dc</color>
<color name="quantum_blue_grey_300">#ff90a4ae</color>
<color name="quantum_blue_grey_500">#ff607d8b</color>
<color name="quantum_blue_grey_700">#ff455a64</color>
<color name="material_blue_grey_50">#ffeceff1</color>
<color name="material_blue_grey_100">#ffcfd8dc</color>
<color name="material_blue_grey_300">#ff90a4ae</color>
<color name="material_blue_grey_500">#ff607d8b</color>
<color name="material_blue_grey_700">#ff455a64</color>
<color name="quantum_orange_100">#ffffe0b2</color>
<color name="quantum_orange_300">#ffffb74d</color>
<color name="quantum_orange_500">#ffff9800</color>
<color name="quantum_orange_700">#fff57c00</color>
<color name="quantum_orange_A200">#ffffab40</color>
<color name="quantum_orange_A400">#ffff9100</color>
<color name="material_orange_100">#ffffe0b2</color>
<color name="material_orange_300">#ffffb74d</color>
<color name="material_orange_500">#ffff9800</color>
<color name="material_orange_700">#fff57c00</color>
<color name="material_orange_A200">#ffffab40</color>
<color name="material_orange_A400">#ffff9100</color>
<color name="quantum_accent_color_light">#FF009688</color>
<color name="quantum_accent_color_dark">#FF80CBC4</color>
<color name="quantum_empty_color_light">#FFCED7DB</color>
<color name="material_accent_color_light">#FF009688</color>
<color name="material_accent_color_dark">#FF80CBC4</color>
<color name="material_empty_color_light">#FFCED7DB</color>
<!-- Palette colors referenced by top-level themes and manually copied into base theme. -->
<color name="theme_primary">#ff263238</color>
<color name="theme_primary_dark">@color/theme_primary</color>
<color name="theme_accent">@color/quantum_accent_color_light</color>
<color name="theme_accent">@color/material_accent_color_light</color>
<color name="dashboard_background_color">#ffe1e1e0</color>
<color name="switchbar_background_color">#ff384248</color>

22
res/values/styles.xml
View File

@@ -57,7 +57,7 @@
</style>
<style name="TextAppearance" parent="android:TextAppearance.Quantum">
<style name="TextAppearance" parent="android:TextAppearance.Material">
</style>
<style name="TextAppearance.info_label">
@@ -75,7 +75,7 @@
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Quantum">
<style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Material">
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:textStyle">bold</item>
@@ -202,18 +202,18 @@
<item name="android:windowIsFloating">true</item>
</style>
<style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Quantum.Light.NoActionBar">
<style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Material.Light.NoActionBar">
<item name="android:background">#ff000000</item>
</style>
<style name="SecurityPreferenceButtonContainer" parent="@android:style/Widget.Quantum.Light.SegmentedButton">
<style name="SecurityPreferenceButtonContainer" parent="@android:style/Widget.Material.Light.SegmentedButton">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:weightSum">2</item>
<item name="android:dividerPadding">8dip</item>
</style>
<style name="SecurityPreferenceButton" parent="@android:style/Widget.Quantum.Light.Button.Borderless">
<style name="SecurityPreferenceButton" parent="@android:style/Widget.Material.Light.Button.Borderless">
<item name="android:layout_width">0dip</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_height">wrap_content</item>
@@ -239,7 +239,7 @@
<item name="android:widgetLayout">@layout/preference_inputmethod_widget</item>
</style>
<style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Quantum.Small">
<style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Material.Small">
<item name="android:textAllCaps">true</item>
<item name="android:textStyle">bold</item>
</style>
@@ -255,23 +255,23 @@
<item name="android:layout">@layout/apn_preference_layout</item>
</style>
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Quantum.Medium">
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium">
</style>
<style name="TextAppearance.Small" parent="@android:style/TextAppearance.Quantum.Small">
<style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small">
</style>
<style name="TextAppearance.Switch" parent="TextAppearance.Medium">
</style>
<style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Quantum.Small">
<style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Small">
<item name="android:textColor">#FF009688</item>
</style>
<style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Quantum.Medium">
<style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Medium">
</style>
<style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Quantum.Small">
<style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Material.Small">
</style>
<style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle">

26
res/values/themes.xml
View File

@@ -21,40 +21,40 @@
<attr name="setup_divider_color" format="reference" />
<attr name="wifi_signal" format="reference" />
<style name="SetupWizardWifiTheme" parent="android:Theme.Quantum.NoActionBar">
<style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar">
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
</style>
<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Quantum.Light.NoActionBar">
<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
</style>
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Quantum.Dialog.Alert">
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
</style>
<style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Quantum.Light.Dialog.Alert">
<style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_quantum</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
</style>
@@ -63,7 +63,7 @@
layouts against a remote context using our local theme colors. Due to the implementation
details of Theme, we can't reference any local resources and MUST instead use the values
directly. So use #ff263238 instead of @color/theme_primary and so on. -->
<style name="Theme.SettingsBase" parent="@android:style/Theme.Quantum.Light.DarkActionBar">
<style name="Theme.SettingsBase" parent="@android:style/Theme.Material.Light.DarkActionBar">
<!-- Should match @color/theme_primary. -->
<item name="android:colorPrimary">#ff263238</item>
<!-- Should match @color/theme_primary_dark. -->
@@ -96,11 +96,11 @@
</style>
<style name="Theme.ActionBar" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid">
<style name="Theme.ActionBar" parent="@android:style/Widget.Material.Light.ActionBar.Solid">
<item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
</style>
<style name="Theme.DialogWhenLarge" parent="android:style/Theme.Quantum.Light.DialogWhenLarge">
<style name="Theme.DialogWhenLarge" parent="android:style/Theme.Material.Light.DialogWhenLarge">
<!-- Used by the ActionBar -->
<item name="android:colorPrimary">@color/theme_primary</item>
<!-- Used by the StatusBar -->
@@ -114,10 +114,10 @@
<style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">
<item name="android:actionBarWidgetTheme">@null</item>
<item name="android:actionBarTheme">@android:style/ThemeOverlay.Quantum.Dark.ActionBar</item>
<item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
</style>
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Quantum.Light.Dialog.Alert">
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
<!-- Used by the ActionBar -->