diff options
author | Danesh Mondegarian <daneshm90@gmail.com> | 2013-10-23 04:02:41 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-10-23 04:02:41 +0000 |
commit | f2a85b1a0ab23ccc9463be0f13e65615ffa6c4b9 (patch) | |
tree | 7242c271d91ad96d1a1bf7fc1065ff014152ced9 /res | |
parent | 7769abd65dea641e1aca2b53120bfa17d4afe395 (diff) | |
parent | efa4b8d18459243abf379bb0135ee0a89165a50a (diff) | |
download | android_packages_apps_Trebuchet-f2a85b1a0ab23ccc9463be0f13e65615ffa6c4b9.tar.gz android_packages_apps_Trebuchet-f2a85b1a0ab23ccc9463be0f13e65615ffa6c4b9.tar.bz2 android_packages_apps_Trebuchet-f2a85b1a0ab23ccc9463be0f13e65615ffa6c4b9.zip |
Merge "Trebuchet : Fix dynamic padding" into cm-10.2
Diffstat (limited to 'res')
-rw-r--r-- | res/values/cm_strings.xml | 2 | ||||
-rw-r--r-- | res/xml/preferences_homescreen.xml | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 5ef593b3c..4fad35400 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -81,8 +81,6 @@ <string name="preferences_interface_homescreen_general_grid_summary">Choose the number of rows/columns on the homescreen</string> <string name="preferences_interface_homescreen_general_grid_rows_title">Rows</string> <string name="preferences_interface_homescreen_general_grid_columns_title">Columns</string> - <string name="preferences_interface_homescreen_general_stretch_screens_title">Stretch screens</string> - <string name="preferences_interface_homescreen_general_stretch_screens_summary">Expand homescreens to fill the size of display</string> <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Hide icon labels</string> <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Hide homescreen icon labels</string> <string name="preferences_interface_homescreen_scrolling_category">Scrolling</string> diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml index ec4ef8d91..18342253b 100644 --- a/res/xml/preferences_homescreen.xml +++ b/res/xml/preferences_homescreen.xml @@ -45,10 +45,6 @@ launcher:maxExternal="ui_homescreen_screens" launcher:max="5" launcher:min="1" /> - <CheckBoxPreference android:key="ui_homescreen_stretch_screens" - android:title="@string/preferences_interface_homescreen_general_stretch_screens_title" - android:summary="@string/preferences_interface_homescreen_general_stretch_screens_summary" - android:defaultValue="true" /> <CheckBoxPreference android:key="ui_homescreen_general_search" android:title="@string/preferences_interface_homescreen_general_search_title" android:summary="@string/preferences_interface_homescreen_general_search_summary" |