diff options
4 files changed, 20 insertions, 18 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 0fd5d2c..17775ab 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -1010,20 +1010,7 @@ public class SecuritySettings extends SettingsPreferenceFragment result.add(data); } - // Advanced - final LockPatternUtils lockPatternUtils = new LockPatternUtils(context); - if (lockPatternUtils.isSecure(MY_USER_ID)) { - ArrayList<TrustAgentComponentInfo> agents = - getActiveTrustAgents(context.getPackageManager(), lockPatternUtils, - context.getSystemService(DevicePolicyManager.class)); - for (int i = 0; i < agents.size(); i++) { - final TrustAgentComponentInfo agent = agents.get(i); - data = new SearchIndexableRaw(context); - data.title = agent.title; - data.screenTitle = screenTitle; - result.add(data); - } - } + return result; } @@ -1032,8 +1019,6 @@ public class SecuritySettings extends SettingsPreferenceFragment final List<String> keys = new ArrayList<String>(); LockPatternUtils lockPatternUtils = new LockPatternUtils(context); - // Add options for lock/unlock screen - int resId = getResIdForLockUnlockScreen(context, lockPatternUtils); // Do not display SIM lock for devices without an Icc card TelephonyManager tm = TelephonyManager.getDefault(); diff --git a/src/com/android/settings/TrustAgentUtils.java b/src/com/android/settings/TrustAgentUtils.java index 109663a..7fed4ec 100644 --- a/src/com/android/settings/TrustAgentUtils.java +++ b/src/com/android/settings/TrustAgentUtils.java @@ -55,7 +55,7 @@ public class TrustAgentUtils { public static class TrustAgentComponentInfo { ComponentName componentName; - String title; + public String title; String summary; boolean disabledByAdministrator; } diff --git a/src/com/android/settings/cyanogenmod/LockscreenSettingsAlias.java b/src/com/android/settings/cyanogenmod/LockscreenSettingsAlias.java index d6ca06a..f89de89 100644 --- a/src/com/android/settings/cyanogenmod/LockscreenSettingsAlias.java +++ b/src/com/android/settings/cyanogenmod/LockscreenSettingsAlias.java @@ -16,8 +16,10 @@ package com.android.settings.cyanogenmod; +import android.app.admin.DevicePolicyManager; import com.android.internal.widget.LockPatternUtils; import com.android.settings.SecuritySettings; +import com.android.settings.TrustAgentUtils; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.SearchIndexableRaw; @@ -110,6 +112,21 @@ public class LockscreenSettingsAlias extends SecuritySettings { result.add(data); } + // Advanced + final LockPatternUtils lockPatternUtils = new LockPatternUtils(context); + if (lockPatternUtils.isSecure(MY_USER_ID)) { + ArrayList<TrustAgentUtils.TrustAgentComponentInfo> agents = + getActiveTrustAgents(context.getPackageManager(), lockPatternUtils, + context.getSystemService(DevicePolicyManager.class)); + for (int i = 0; i < agents.size(); i++) { + final TrustAgentUtils.TrustAgentComponentInfo agent = agents.get(i); + data = new SearchIndexableRaw(context); + data.title = agent.title; + data.screenTitle = screenTitle; + result.add(data); + } + } + return result; } } diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java index 4fc93db..146c640 100644 --- a/src/com/android/settings/search/IndexDatabaseHelper.java +++ b/src/com/android/settings/search/IndexDatabaseHelper.java @@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper { private static final String TAG = "IndexDatabaseHelper"; private static final String DATABASE_NAME = "search_index.db"; - private static final int DATABASE_VERSION = 120; + private static final int DATABASE_VERSION = 121; public interface Tables { public static final String TABLE_PREFS_INDEX = "prefs_index"; |