summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.com>2012-08-17 01:41:30 +0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-08-17 01:41:30 +0400
commit8f0e8b1ac895b33fd876d6a6e9de366b66ce839d (patch)
tree4ec19c668c753a8cd4fa36db2c9ee22a4df9280e
parent192d17bde2fce0841872d20dc2813ba547e4170f (diff)
parentf4344a9fd1823e0b0f04f5a9675a6f634c729ba9 (diff)
downloadandroid_packages_apps_Trebuchet-8f0e8b1ac895b33fd876d6a6e9de366b66ce839d.tar.gz
android_packages_apps_Trebuchet-8f0e8b1ac895b33fd876d6a6e9de366b66ce839d.tar.bz2
android_packages_apps_Trebuchet-8f0e8b1ac895b33fd876d6a6e9de366b66ce839d.zip
Merge "Preferences: Hide dock/icon categories" into jellybean
-rw-r--r--res/xml/preferences.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index bc3c58c92..2aa383a83 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -115,16 +115,16 @@
</PreferenceScreen>
<!-- Dock -->
- <PreferenceScreen android:key="ui_dock"
+ <!-- <PreferenceScreen android:key="ui_dock"
android:title="@string/preferences_interface_dock_title">
- </PreferenceScreen>
+ </PreferenceScreen> -->
<!-- Icons -->
- <PreferenceScreen android:key="ui_icons"
+ <!-- <PreferenceScreen android:key="ui_icons"
android:title="@string/preferences_interface_icons_title">
- </PreferenceScreen>
+ </PreferenceScreen> -->
<!-- General -->
<PreferenceScreen android:key="ui_general"