Use SettingsLib Indexable
- Use SettingsLib Indexable - Directly use resource id in getPreferenceScreenResId Bug: 135053028 Test: roboletric Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user