diff options
| author | Raff Tsai <rafftsai@google.com> | 2019-09-25 11:19:06 +0800 |
|---|---|---|
| committer | Raff Tsai <rafftsai@google.com> | 2019-09-25 18:24:56 +0800 |
| commit | 966fa01423b70424abbfc6c5029088a354e5d00c (patch) | |
| tree | d8219e7c1916a9320de1a7847be934d764b0c51f /src/com/android/settings/security | |
| parent | b722db9d4158d88a92974bdd309480bd808d31c0 (diff) | |
| download | packages_apps_Settings-966fa01423b70424abbfc6c5029088a354e5d00c.tar.gz packages_apps_Settings-966fa01423b70424abbfc6c5029088a354e5d00c.tar.bz2 packages_apps_Settings-966fa01423b70424abbfc6c5029088a354e5d00c.zip | |
Use SettingsLib Indexable
- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId
Bug: 135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
Diffstat (limited to 'src/com/android/settings/security')
4 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java index 5688b204c5..3e88fa8e5f 100644 --- a/src/com/android/settings/security/EncryptionAndCredential.java +++ b/src/com/android/settings/security/EncryptionAndCredential.java @@ -59,7 +59,7 @@ public class EncryptionAndCredential extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.encryption_and_credential; } private static List<AbstractPreferenceController> buildPreferenceControllers(Context context, diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index f63ccb2608..29b114a318 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -77,7 +77,7 @@ public class LockscreenDashboardFragment extends DashboardFragment @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.security_lockscreen_settings; } @Override diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java index 1cc6b3f83c..c1a0f46761 100644 --- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java +++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java @@ -19,7 +19,6 @@ package com.android.settings.security.screenlock; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.UserHandle; -import android.provider.SearchIndexableResource; import androidx.fragment.app.Fragment; @@ -27,7 +26,6 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.security.OwnerInfoPreferenceController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java index 0129fcec47..72898248b0 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentSettings.java +++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java @@ -23,7 +23,7 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; |