summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorNebojsa Cvetkovic <nebkat@gmail.com>2014-01-06 17:51:04 +0000
committerDanesh M <daneshm90@gmail.com>2014-01-24 16:25:20 -0800
commite67457f746a62d2f893021ceb028e23a89589e42 (patch)
tree7d091bcf8c37d9e0de18bd86c8b707e4eda4db8d /res
parent78ffd65b78ce1e7c97fb408091d401aa6dd3193c (diff)
downloadandroid_packages_apps_Trebuchet-e67457f746a62d2f893021ceb028e23a89589e42.tar.gz
android_packages_apps_Trebuchet-e67457f746a62d2f893021ceb028e23a89589e42.tar.bz2
android_packages_apps_Trebuchet-e67457f746a62d2f893021ceb028e23a89589e42.zip
WallpaperPickerActivity: Move wallpaper scroll preference to menu
Change-Id: I734260cb0c2f86ebe9d5dbbe7367520e9760008f
Diffstat (limited to 'res')
-rw-r--r--res/values/cm_strings.xml5
-rw-r--r--res/xml/preferences_homescreen.xml4
2 files changed, 3 insertions, 6 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 50b8bad73..028426970 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -19,6 +19,9 @@
<string name="sort_mode_launch_count">Launch Count</string>
<string name="sort_mode_install_time">Install Time</string>
+
+ <string name="wallpaper_scroll">Scroll wallpaper</string>
+
<!-- Settings -->
<string name="preferences_title">Settings</string>
<!-- UI -->
@@ -33,8 +36,6 @@
<string name="preferences_interface_homescreen_search_title">Search bar</string>
<string name="preferences_interface_homescreen_search_summary">Show persistent search bar at top of screen</string>
<string name="preferences_interface_homescreen_scrolling_category">Scrolling</string>
- <string name="preferences_interface_homescreen_scrolling_wallpaper_scroll_title">Scroll wallpaper</string>
- <string name="preferences_interface_homescreen_scrolling_wallpaper_scroll_summary">Pan wallpaper while scrolling homescreens</string>
<string name="preferences_interface_homescreen_scrolling_page_outlines_title">Page outlines</string>
<string name="preferences_interface_homescreen_scrolling_page_outlines_summary">Show page outlines while scrolling homescreens</string>
diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml
index 41ad848a3..438611808 100644
--- a/res/xml/preferences_homescreen.xml
+++ b/res/xml/preferences_homescreen.xml
@@ -23,10 +23,6 @@
android:summary="@string/preferences_interface_homescreen_search_summary"
android:defaultValue="@bool/preferences_interface_homescreen_search_default" />
<PreferenceCategory android:title="@string/preferences_interface_homescreen_scrolling_category">
- <CheckBoxPreference android:key="ui_homescreen_scrolling_wallpaper_scroll"
- android:title="@string/preferences_interface_homescreen_scrolling_wallpaper_scroll_title"
- android:summary="@string/preferences_interface_homescreen_scrolling_wallpaper_scroll_summary"
- android:defaultValue="@bool/preferences_interface_homescreen_scrolling_wallpaper_scroll_default" />
<CheckBoxPreference android:key="ui_homescreen_scrolling_page_outlines"
android:title="@string/preferences_interface_homescreen_scrolling_page_outlines_title"
android:summary="@string/preferences_interface_homescreen_scrolling_page_outlines_summary"