diff options
author | Flamefire <alex@grundis.de> | 2014-04-02 20:02:43 +0200 |
---|---|---|
committer | Flamefire <alex@grundis.de> | 2014-04-22 19:40:44 +0200 |
commit | 45936b33b0e03b1f3111a0bfaa61344cd10b2cd1 (patch) | |
tree | 55d20ae5f55397e9e28275a4e987774d1b18c4f4 /res | |
parent | 6a43e660cce2cda206f4fecf3ed4ecf9dce8f326 (diff) | |
download | android_packages_apps_Trebuchet-45936b33b0e03b1f3111a0bfaa61344cd10b2cd1.tar.gz android_packages_apps_Trebuchet-45936b33b0e03b1f3111a0bfaa61344cd10b2cd1.tar.bz2 android_packages_apps_Trebuchet-45936b33b0e03b1f3111a0bfaa61344cd10b2cd1.zip |
Add options to hide icon labels from drawer and homescreen
Forward port from CM 10.2
PS3: Fix typo
PS4: Rebase and global defaults
PS8: Rebase to head
Issue: There is already an Icon section in general, move both
settings there or leave separate in their categories?
Change-Id: I90ae4d2357e5f45fa9261c4eaa0fcf287996e327
Diffstat (limited to 'res')
-rw-r--r-- | res/values/cm_strings.xml | 4 | ||||
-rw-r--r-- | res/values/preferences_defaults.xml | 2 | ||||
-rw-r--r-- | res/xml/preferences_drawer.xml | 6 | ||||
-rw-r--r-- | res/xml/preferences_homescreen.xml | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 73598a571..7f5de470f 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -52,6 +52,8 @@ <string name="preferences_interface_homescreen_title">Homescreen</string> <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_general_hide_icon_labels_title">Hide icon labels</string> + <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Hide icon labels on homescreen</string> <!-- Drawer --> <string name="preferences_interface_drawer_title">Drawer</string> @@ -63,6 +65,8 @@ <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Remove the shortcuts of hidden apps from the homescreen</string> <string name="preferences_interface_drawer_hidden_apps_widgets_title">Remove widgets</string> <string name="preferences_interface_drawer_hidden_apps_widgets_summary">Remove the widgets of hidden apps from the homescreen</string> + <string name="preferences_interface_drawer_hide_icon_labels_title">Hide icon labels</string> + <string name="preferences_interface_drawer_hide_icon_labels_summary">Hide icon labels in drawer</string> <!-- Dock --> <string name="preferences_interface_dock_title">Dock</string> diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml index daf28a3de..676b174a2 100644 --- a/res/values/preferences_defaults.xml +++ b/res/values/preferences_defaults.xml @@ -5,10 +5,12 @@ <bool name="preferences_interface_homescreen_scrolling_wallpaper_scroll_default">true</bool> <bool name="preferences_interface_homescreen_scrolling_page_outlines_default">@bool/config_workspaceDefaultShowOutlines</bool> <bool name="preferences_interface_homescreen_scrolling_fade_adjacent_default">@bool/config_workspaceFadeAdjacentScreens</bool> + <bool name="preferences_interface_homescreen_hide_icon_labels">true</bool> <string name="preferences_interface_drawer_scrolling_transition_effect">stack</string> <bool name="preferences_interface_drawer_scrolling_fade_adjacent_default">false</bool> <bool name="preferences_interface_drawer_remove_hidden_apps_shortcuts_default">true</bool> <bool name="preferences_interface_drawer_remove_hidden_apps_widgets_default">true</bool> + <bool name="preferences_interface_drawer_hide_icon_labels_default">true</bool> <bool name="preferences_interface_general_icons_large_default">@bool/config_largeIcons</bool> <string name="preferences_interface_general_icons_text_font_family_default">sans-serif-condensed</string> <integer name="preferences_interface_general_icons_text_font_style_default">0</integer> diff --git a/res/xml/preferences_drawer.xml b/res/xml/preferences_drawer.xml index c59d6b7fe..b22597516 100644 --- a/res/xml/preferences_drawer.xml +++ b/res/xml/preferences_drawer.xml @@ -33,4 +33,10 @@ android:summary="@string/preferences_interface_drawer_hidden_apps_widgets_summary" android:defaultValue="@bool/preferences_interface_drawer_remove_hidden_apps_widgets_default" /> </PreferenceCategory> + <PreferenceCategory android:title="@string/preferences_interface_general_icons_category"> + <CheckBoxPreference android:key="ui_drawer_hide_icon_labels" + android:title="@string/preferences_interface_drawer_hide_icon_labels_title" + android:summary="@string/preferences_interface_drawer_hide_icon_labels_summary" + android:defaultValue="@bool/preferences_interface_drawer_hide_icon_labels_default" /> + </PreferenceCategory> </PreferenceScreen>
\ No newline at end of file diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml index 8b2652b9a..4671a8a4a 100644 --- a/res/xml/preferences_homescreen.xml +++ b/res/xml/preferences_homescreen.xml @@ -22,4 +22,8 @@ android:title="@string/preferences_interface_homescreen_search_title" android:summary="@string/preferences_interface_homescreen_search_summary" android:defaultValue="@bool/preferences_interface_homescreen_search_default" /> + <CheckBoxPreference android:key="ui_homescreen_general_hide_icon_labels" + android:title="@string/preferences_interface_homescreen_general_hide_icon_labels_title" + android:summary="@string/preferences_interface_homescreen_general_hide_icon_labels_summary" + android:defaultValue="@bool/preferences_interface_homescreen_hide_icon_labels" /> </PreferenceScreen> |