PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup in Zen Mode Settings

Browse Source 
Changes in response to code review from automerged commit ag/3171711

Test: make -j40 RunSettingsRoboTests
Bug: n/a
Change-Id: I5df3db4e8ff421ca9911c84ae3f621a0e3d08092
This commit is contained in:
Beverly
2017-11-17 10:00:20 -05:00
parent 12108840a0
commit 495c646744
14 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -38,7 +38,6 @@ import java.util.Map;
import java.util.Map.Entry;
public class ZenModeSettings extends ZenModeSettingsBase {
@Override
protected int getPreferenceScreenResId() {
return R.xml.zen_mode_settings;
@@ -59,7 +58,6 @@ public class ZenModeSettings extends ZenModeSettingsBase {
return R.string.help_uri_interruptions;
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
@@ -195,24 +193,26 @@ public class ZenModeSettings extends ZenModeSettingsBase {
*/
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.zen_mode_settings;
return Arrays.asList(sir);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
keys.add(ZenModeButtonPreferenceController.KEY);
return keys;
}
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.zen_mode_settings;
return Arrays.asList(sir);
}
@Override
public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context, null);
}
};
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
keys.add(ZenModeButtonPreferenceController.KEY);
return keys;
}
@Override
public List<AbstractPreferenceController> getPreferenceControllers(Context
context) {
return buildPreferenceControllers(context, null);
}
};
}