summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/OverviewSettingsPanel.java
diff options
context:
space:
mode:
authorAbhisek Devkota <ciwrl@cyanogenmod.com>2014-06-12 21:52:32 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-06-12 21:52:32 +0000
commit9d9a1c05734ba45d117748b28de366c4c345d858 (patch)
tree47b860817ce71629829f6676e9c7c2f324a843b2 /src/com/android/launcher3/OverviewSettingsPanel.java
parentc284a5706301f7b8835856554df4b18e93a3f82f (diff)
parentcf84500bd174148d4f7e6ce5a840c4f8f31cbabd (diff)
downloadandroid_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 'src/com/android/launcher3/OverviewSettingsPanel.java')
-rw-r--r--src/com/android/launcher3/OverviewSettingsPanel.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index 7ba1f76e0..fd8095f87 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -13,6 +13,8 @@ import com.android.launcher3.list.SettingsPinnedHeaderAdapter;
public class OverviewSettingsPanel {
public static final String ANDROID_SETTINGS = "com.android.settings";
+ public static final String ANDROID_PROTECTED_APPS =
+ "com.android.settings.applications.ProtectedAppsActivity";
public static final String THEME_SETTINGS =
"com.android.settings.Settings$ThemeSettingsActivity";
public static final int HOME_SETTINGS_POSITION = 0;
@@ -46,7 +48,8 @@ public class OverviewSettingsPanel {
String[] valuesDrawer = new String[] {
res.getString(R.string.scroll_effect_text),
res.getString(R.string.drawer_sorting_text),
- res.getString(R.string.hide_icon_labels)};
+ res.getString(R.string.hide_icon_labels),
+ res.getString(R.string.protected_app_settings)};
mSettingsAdapter = new SettingsPinnedHeaderAdapter(mLauncher);
mSettingsAdapter.setHeaders(headers);