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

Merge "Fix Zen tests that were failing with modes_ui enabled" into main

Browse Source
This commit is contained in:
Matías Hernández
2024-07-31 09:21:04 +00:00
committed by Android (Google) Code Review
parent b7f68b4a60 f4d44c5500
commit d21dec33d1
17 changed files with 120 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/notification/modes/ZenModesListFragment.java
View File

@@ -49,15 +49,11 @@ public class ZenModesListFragment extends ZenModesFragmentBase {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, this::onAvailableModeTypesForAdd);
return buildPreferenceControllers(context, mBackend, this::onAvailableModeTypesForAdd);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
OnAddModeListener onAddModeListener) {
// We need to redefine ZenModesBackend here even though mBackend exists so that this method
// can be static; it must be static to be able to be used in SEARCH_INDEX_DATA_PROVIDER.
ZenModesBackend backend = ZenModesBackend.getInstance(context);
ZenModesBackend backend, OnAddModeListener onAddModeListener) {
return ImmutableList.of(
new ZenModesListPreferenceController(context, backend),
new ZenModesListAddModePreferenceController(context, onAddModeListener)
@@ -150,7 +146,10 @@ public class ZenModesListFragment extends ZenModesFragmentBase {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, ignoredType -> {});
// We need to redefine ZenModesBackend here even though mBackend exists so that
// SEARCH_INDEX_DATA_PROVIDER can be static.
return buildPreferenceControllers(context, ZenModesBackend.getInstance(context),
ignoredType -> {});
}
};
}