diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-12-24 05:39:53 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-24 05:39:53 -0800 |
| commit | b8720bacbc70d6ada2ba81561283fc6ba3e09bef (patch) | |
| tree | db8fb1d08aded35c1bc36f17d4aa42d40de85d2e /res | |
| parent | dcc1ded62375e961c9efd958b18fbc1690bbf748 (diff) | |
| parent | 1650f04a9d18c97589176962e1b89b658d65bca8 (diff) | |
| download | android_packages_apps_Trebuchet-b8720bacbc70d6ada2ba81561283fc6ba3e09bef.tar.gz android_packages_apps_Trebuchet-b8720bacbc70d6ada2ba81561283fc6ba3e09bef.tar.bz2 android_packages_apps_Trebuchet-b8720bacbc70d6ada2ba81561283fc6ba3e09bef.zip | |
Merge "Hotseat: Default Page" into cm-10.1
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/preferences_dock.xml | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 87047d2b6..281b01bec 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -384,6 +384,8 @@ 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_summary">Choose the default page</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 08a2c19fb..7f5de9605 100644 --- a/res/xml/preferences_dock.xml +++ b/res/xml/preferences_dock.xml @@ -24,6 +24,13 @@ android:defaultValue="1" launcher:max="3" launcher:min="1" /> + <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_dock_default_page" + android:title="@string/preferences_interface_dock_default_page_title" + android:summary="@string/preferences_interface_dock_default_page_summary" + android:defaultValue="1" + launcher:maxExternal="ui_dock_pages" + launcher:max="3" + launcher:min="1" /> <CheckBoxPreference android:key="ui_dock_divider" android:title="@string/preferences_interface_dock_divider_title" android:summary="@string/preferences_interface_dock_divider_summary" |