summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/security
diff options
context:
space:
mode:
authorRaff Tsai <rafftsai@google.com>2019-09-19 17:06:45 +0800
committerRaff Tsai <rafftsai@google.com>2019-09-24 00:35:52 +0800
commitac3e0d0988dc8d75c201f455f4fc2e134243044e (patch)
tree3beb455295f8f0a1578d16700bdb6f2aeef5d93c /src/com/android/settings/security
parent5ff9517f23af0299af5b4ca9959923f79cde512a (diff)
downloadpackages_apps_Settings-ac3e0d0988dc8d75c201f455f4fc2e134243044e.tar.gz
packages_apps_Settings-ac3e0d0988dc8d75c201f455f4fc2e134243044e.tar.bz2
packages_apps_Settings-ac3e0d0988dc8d75c201f455f4fc2e134243044e.zip
Directly use BaseIndexableProvider
- Add function getXmlResourceId, Fragments don't need to write xml resource id twice. - Remove getPreferenceControllers from Indexable.java. Because it will move to SettingsLib later for other apps which don't need this function Bug: 135053028 Test: robolectric Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
Diffstat (limited to 'src/com/android/settings/security')
-rw-r--r--src/com/android/settings/security/EncryptionAndCredential.java42
-rw-r--r--src/com/android/settings/security/LockscreenDashboardFragment.java6
-rw-r--r--src/com/android/settings/security/ScreenPinningSettings.java2
-rw-r--r--src/com/android/settings/security/SecuritySettings.java2
-rw-r--r--src/com/android/settings/security/screenlock/ScreenLockSettings.java2
-rw-r--r--src/com/android/settings/security/trustagent/TrustAgentSettings.java2
6 files changed, 22 insertions, 34 deletions
diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java
index a6d2a0ab83..5688b204c5 100644
--- a/src/com/android/settings/security/EncryptionAndCredential.java
+++ b/src/com/android/settings/security/EncryptionAndCredential.java
@@ -21,7 +21,6 @@ import static com.android.settings.security.EncryptionStatusPreferenceController
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserManager;
-import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -60,7 +59,7 @@ public class EncryptionAndCredential extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
- return R.xml.encryption_and_credential;
+ return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
@@ -88,28 +87,19 @@ public class EncryptionAndCredential extends DashboardFragment {
/**
* For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
*/
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new SecuritySearchIndexProvider();
-
- private static class SecuritySearchIndexProvider extends BaseSearchIndexProvider {
-
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(
- Context context, boolean enabled) {
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.encryption_and_credential;
- return Arrays.asList(sir);
- }
-
- @Override
- public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, null /* lifecycle */);
- }
-
- @Override
- protected boolean isPageSearchEnabled(Context context) {
- final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
- return um.isAdminUser();
- }
- }
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.encryption_and_credential) {
+ @Override
+ public List<AbstractPreferenceController> createPreferenceControllers(
+ Context context) {
+ return buildPreferenceControllers(context, null /* lifecycle */);
+ }
+
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ final UserManager um = (UserManager) context.getSystemService(
+ Context.USER_SERVICE);
+ return um.isAdminUser();
+ }
+ };
}
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index f502ee6fb3..f63ccb2608 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -19,7 +19,6 @@ package com.android.settings.security;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.display.AmbientDisplayConfiguration;
-import android.provider.SearchIndexableResource;
import androidx.annotation.VisibleForTesting;
@@ -37,7 +36,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -79,7 +77,7 @@ public class LockscreenDashboardFragment extends DashboardFragment
@Override
protected int getPreferenceScreenResId() {
- return R.xml.security_lockscreen_settings;
+ return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -130,7 +128,7 @@ public class LockscreenDashboardFragment extends DashboardFragment
return mConfig;
}
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.security_lockscreen_settings) {
@Override
diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index c60fd472a9..849db40697 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -216,7 +216,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
/**
* For search
*/
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
index 021d203e28..da8f003180 100644
--- a/src/com/android/settings/security/SecuritySettings.java
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -138,7 +138,7 @@ public class SecuritySettings extends DashboardFragment {
/**
* For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
*/
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.security_dashboard_settings) {
@Override
diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java
index dab483658e..1cc6b3f83c 100644
--- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java
+++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java
@@ -86,7 +86,7 @@ public class ScreenLockSettings extends DashboardFragment
}
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.screen_lock_settings) {
@Override
diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java
index 4f652b208d..0129fcec47 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentSettings.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java
@@ -53,6 +53,6 @@ public class TrustAgentSettings extends DashboardFragment {
return R.xml.trust_agent_settings;
}
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.trust_agent_settings);
}