diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-12-24 05:40:09 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-24 05:40:09 -0800 |
| commit | 8e9cbad0166cf640c3b6602a37d70a5ce2c8a074 (patch) | |
| tree | 1142f3a4e457fc7ac84edc6fa8c07e7ed8c9d91b /res | |
| parent | b8720bacbc70d6ada2ba81561283fc6ba3e09bef (diff) | |
| parent | 3c512865bfc4243ccab4103320407dcd1e58d874 (diff) | |
| download | android_packages_apps_Trebuchet-8e9cbad0166cf640c3b6602a37d70a5ce2c8a074.tar.gz android_packages_apps_Trebuchet-8e9cbad0166cf640c3b6602a37d70a5ce2c8a074.tar.bz2 android_packages_apps_Trebuchet-8e9cbad0166cf640c3b6602a37d70a5ce2c8a074.zip | |
Merge "Hotseat: Number Icons" into cm-10.1
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" |