diff options
author | nebkat <nebkat@teamhacksung.org> | 2012-03-28 18:08:22 +0100 |
---|---|---|
committer | nebkat <nebkat@teamhacksung.org> | 2012-12-24 10:12:26 +0000 |
commit | 3c512865bfc4243ccab4103320407dcd1e58d874 (patch) | |
tree | b1e03685752187600c90fcdc0899fd1e2fc9ac1a /res | |
parent | 1650f04a9d18c97589176962e1b89b658d65bca8 (diff) | |
download | android_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')
-rw-r--r-- | res/values/strings.xml | 4 | ||||
-rw-r--r-- | res/xml/preferences_dock.xml | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 281b01bec..849b96413 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -384,8 +384,10 @@ s --> <string name="preferences_interface_dock_title">Dock</string> <string name="preferences_interface_dock_pages_title">Pages</string> <string name="preferences_interface_dock_pages_summary">Number of pages in the dock</string> - <string name="preferences_interface_dock_default_page_title">Default Page</string> + <string name="preferences_interface_dock_default_page_title">Default page</string> <string name="preferences_interface_dock_default_page_summary">Choose the default page</string> + <string name="preferences_interface_dock_icons_title">Icons</string> + <string name="preferences_interface_dock_icons_summary">Number of icons/columns in the dock</string> <string name="preferences_interface_dock_divider_title">Show dock divider</string> <string name="preferences_interface_dock_divider_summary">Show divider between homescreen and dock</string> 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" |