summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-02-25 22:31:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-25 22:31:06 +0000
commit167f82de3acb6905dd8c45bf36399d0b625abc82 (patch)
treefbac83ce26a01ce63989633ba7131e6eca6733b8 /res
parent9050c57707615dbbd428b20df05ce6f5329cc3f5 (diff)
parent0e2f949c90cc3057243020b51f1bdada02fd87fd (diff)
downloadpackages_apps_Settings-167f82de3acb6905dd8c45bf36399d0b625abc82.tar.gz
packages_apps_Settings-167f82de3acb6905dd8c45bf36399d0b625abc82.tar.bz2
packages_apps_Settings-167f82de3acb6905dd8c45bf36399d0b625abc82.zip
Merge "Fix bug #13140648 Settings needs to support the new Quantum Paper theme"
Diffstat (limited to 'res')
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/xml/settings_headers.xml3
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 206dbacb3..352c7a28b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,7 +15,8 @@
-->
<resources>
- <color name="background_drawer">#ff777777</color>
+ <color name="background_drawer">@android:color/white</color>
+ <color name="background_drawer_icon">#ffcccccc</color>
<color name="black">#000</color>
<color name="red">#F00</color>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 56c17f998..19cff9050 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -62,8 +62,7 @@
android:id="@+id/wireless_settings"
android:title="@string/radio_controls_title"
android:breadCrumbTitle="@string/wireless_networks_settings_title"
- android:fragment="com.android.settings.WirelessSettings"
- android:icon="@drawable/empty_icon" />
+ android:fragment="com.android.settings.WirelessSettings" />
<!-- DEVICE -->
<header android:id="@+id/device_section"