diff options
| author | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-06-12 21:52:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-06-12 21:52:32 +0000 |
| commit | 9d9a1c05734ba45d117748b28de366c4c345d858 (patch) | |
| tree | 47b860817ce71629829f6676e9c7c2f324a843b2 /res/values/cm_strings.xml | |
| parent | c284a5706301f7b8835856554df4b18e93a3f82f (diff) | |
| parent | cf84500bd174148d4f7e6ce5a840c4f8f31cbabd (diff) | |
| download | android_packages_apps_Trebuchet-9d9a1c05734ba45d117748b28de366c4c345d858.tar.gz android_packages_apps_Trebuchet-9d9a1c05734ba45d117748b28de366c4c345d858.tar.bz2 android_packages_apps_Trebuchet-9d9a1c05734ba45d117748b28de366c4c345d858.zip | |
Merge "Protected App [3/3] Trebuchet - Protected Apps - Build fixed to work with LOCAL_SDK_VERSION - Fixed adding components to protected folders and adding protected folders to other folders - Fixed issues with EditText for FolderName - Adding support for Settings hooks - Uses Setting's LockPattern for Protected Apps - Add Read from Settings Secure DB (DO NOT WRITE!) - Protecting a folder updates Launcher without restart - Batch send component visibility" into cm-11.0
Diffstat (limited to 'res/values/cm_strings.xml')
| -rw-r--r-- | res/values/cm_strings.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 1d8034e3f..4d24dffcc 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -91,8 +91,6 @@ <!-- Hidden apps --> <string name="hidden_apps_title">Hidden apps</string> - - <!-- Settings --> <string name="launcher_settings">LAUNCHER SETTINGS</string> <string name="home_screen_settings">HOME SCREEN SETTINGS</string> <string name="drawer_settings">DRAWER SETTINGS</string> @@ -106,8 +104,14 @@ <string name="larger_icons_text">Larger icons</string> <!-- Text for hiding icon labels --> <string name="hide_icon_labels">Hide icon labels</string> + <!-- Protected Apps --> + <string name="protected_app_settings">Protected apps</string> <!-- Settings states --> <string name="setting_state_on">ON</string> <string name="setting_state_off">OFF</string> <string name="themes_button_text">Themes</string> + + <!-- Hidden states --> + <string name="hidden_folder">locked</string> + <string name="unhidden_folder">unlocked</string> </resources> |