summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-03-28 18:08:22 +0100
committernebkat <nebkat@teamhacksung.org>2012-12-24 10:12:26 +0000
commit3c512865bfc4243ccab4103320407dcd1e58d874 (patch)
treeb1e03685752187600c90fcdc0899fd1e2fc9ac1a /res/xml
parent1650f04a9d18c97589176962e1b89b658d65bca8 (diff)
downloadandroid_packages_apps_Trebuchet-3c512865bfc4243ccab4103320407dcd1e58d874.tar.gz
android_packages_apps_Trebuchet-3c512865bfc4243ccab4103320407dcd1e58d874.tar.bz2
android_packages_apps_Trebuchet-3c512865bfc4243ccab4103320407dcd1e58d874.zip
Hotseat: Number Icons
Conflicts: res/values/strings.xml res/xml/preferences.xml src/com/beansoft/launcher/preference/PreferencesProvider.java src/com/cyanogenmod/trebuchet/Hotseat.java Change-Id: I839171c99f4050ad9dc03fbe82c8ed7be41cb4c0
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/preferences_dock.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/res/xml/preferences_dock.xml b/res/xml/preferences_dock.xml
index 7f5de9605..3e85c95d3 100644
--- a/res/xml/preferences_dock.xml
+++ b/res/xml/preferences_dock.xml
@@ -31,6 +31,12 @@
launcher:maxExternal="ui_dock_pages"
launcher:max="3"
launcher:min="1" />
+ <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_dock_icons"
+ android:title="@string/preferences_interface_dock_icons_title"
+ android:summary="@string/preferences_interface_dock_icons_summary"
+ android:defaultValue="@integer/hotseat_cell_count"
+ launcher:max="@integer/hotseat_cell_count"
+ launcher:min="3" />
<CheckBoxPreference android:key="ui_dock_divider"
android:title="@string/preferences_interface_dock_divider_title"
android:summary="@string/preferences_interface_dock_divider_summary"