diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:00 -0800 |
---|---|---|
committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:56 -0800 |
commit | 4e4db4563a7ddf262993a9312781c66d34485ea4 (patch) | |
tree | afdcf8ce885b656e42e062faca390fba0fb9c484 /res/values/cm_strings.xml | |
parent | c2e0e2b87255a1fb002eadf7735e99614b7de656 (diff) | |
download | android_packages_apps_Trebuchet-4e4db4563a7ddf262993a9312781c66d34485ea4.tar.gz android_packages_apps_Trebuchet-4e4db4563a7ddf262993a9312781c66d34485ea4.tar.bz2 android_packages_apps_Trebuchet-4e4db4563a7ddf262993a9312781c66d34485ea4.zip |
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
Conflicts:
AndroidManifest.xml
res/values/preferences_defaults.xml
src/com/android/launcher3/AppsCustomizePagedView.java
src/com/android/launcher3/Folder.java
src/com/android/launcher3/FolderIcon.java
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/LauncherModel.java
src/com/android/launcher3/LauncherProvider.java
src/com/android/launcher3/OverviewSettingsPanel.java
Change-Id: I41c295e7f2c9abc9b2e77e6e3d39b7ca60d47139
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 2fe669727..23077db1e 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -99,8 +99,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> @@ -114,8 +112,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> |