Use SettingsLib Indexable

- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId

Bug: 135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
This commit is contained in:
Raff Tsai
2019-09-25 11:19:06 +08:00
parent b722db9d41
commit 966fa01423
121 changed files with 131 additions and 299 deletions

View File

@@ -46,7 +46,7 @@ public class ManageAssist extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.manage_assist;
}
@Override

View File

@@ -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.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;

View File

@@ -48,7 +48,7 @@ public class ManageDomainUrls extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.manage_domain_url_settings;
}
@Override

View File

@@ -35,7 +35,7 @@ public class SpecialAccessSettings extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.special_access;
}
@Override

View File

@@ -33,7 +33,7 @@ public class DeviceAdminSettings extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.device_admin_settings;
}
@Override

View File

@@ -185,7 +185,7 @@ public class PictureInPictureSettings extends EmptyTextSettings {
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.picture_in_picture_settings;
}
@Override

View File

@@ -91,7 +91,7 @@ public class PremiumSmsAccess extends EmptyTextSettings
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.premium_sms_settings;
}
@Override

View File

@@ -61,7 +61,7 @@ public class VrListenerSettings extends ManagedServiceSettings {
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.vr_listeners_settings;
}
@VisibleForTesting