diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-04-26 17:50:32 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-04-26 17:50:32 -0700 |
| commit | d8bbfbd1605ef3149d9447b376e6e3c387d66b8b (patch) | |
| tree | c0f5bff4f267beb8ec899a0782df878e9b686bdf /res/values | |
| parent | d8f4d1fa1bea82a922c0b2951ade54e9548a9d91 (diff) | |
| parent | 84110c3e8b6fde6a57f1fca2da11fa7a0052dfbb (diff) | |
| download | android_packages_apps_Trebuchet-d8bbfbd1605ef3149d9447b376e6e3c387d66b8b.tar.gz android_packages_apps_Trebuchet-d8bbfbd1605ef3149d9447b376e6e3c387d66b8b.tar.bz2 android_packages_apps_Trebuchet-d8bbfbd1605ef3149d9447b376e6e3c387d66b8b.zip | |
Merge remote-tracking branch 'github/cm-11.0' into HEAD
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/cm_strings.xml | 18 | ||||
| -rw-r--r-- | res/values/preferences_defaults.xml | 6 |
2 files changed, 23 insertions, 1 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 33da3d2e9..7f5de470f 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -52,9 +52,21 @@ <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> + <string name="preferences_interface_drawer_summary">Apps and widgets drawer</string> + <string name="preferences_interface_drawer_apps_category">Apps</string> + <string name="preferences_interface_drawer_hidden_apps_title">Hidden apps</string> + <string name="preferences_interface_drawer_hidden_apps_summary">Hide apps from the drawer</string> + <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Remove shortcuts</string> + <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> @@ -78,4 +90,10 @@ <string name="all_apps_cling_cm">Customize your drawer</string> <!-- The description of how to access Trebuchet settings [CHAR_LIMIT=160] --> <string name="all_apps_cling_summary">Tap the page indicator to view additional configuration settings</string> + + <!-- Noun, menu item used to reset hidden apps list --> + <string name="menu_hidden_apps_delete">Reset</string> + + <!-- Hidden apps --> + <string name="hidden_apps_title">Hidden apps</string> </resources> diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml index 288157381..98f571229 100644 --- a/res/values/preferences_defaults.xml +++ b/res/values/preferences_defaults.xml @@ -5,9 +5,13 @@ <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">false</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">false</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> -</resources>
\ No newline at end of file +</resources> |