Move ListAddMode PrefController key to constructor
Passes the key for the ZenModesListAddModePreferenceController into the
constructor, to be supplied from the Fragment.
Flag: android.app.modes_ui
Bug: 361144180
Test: atest ZenModesListAddModePreferenceControllerTest
Change-Id: I23d5c11f8676b9ed2bde807e24f20346444e7963
diff --git a/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java b/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java
index ab2a2f7..0096be5 100644
--- a/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java
@@ -51,8 +51,6 @@
import java.util.function.Function;
class ZenModesListAddModePreferenceController extends BasePreferenceController {
- protected static final String KEY = "add_mode";
-
private final ZenServiceListing mServiceListing;
private final OnAddModeListener mOnAddModeListener;
@@ -70,8 +68,9 @@
void onAvailableModeTypesForAdd(List<ModeType> types);
}
- ZenModesListAddModePreferenceController(Context context, OnAddModeListener onAddModeListener) {
- this(context, onAddModeListener, new ZenServiceListing(context),
+ ZenModesListAddModePreferenceController(Context context, String key,
+ OnAddModeListener onAddModeListener) {
+ this(context, key, onAddModeListener, new ZenServiceListing(context),
new ConfigurationActivityHelper(context.getPackageManager()),
context.getSystemService(NotificationManager.class), context.getPackageManager(),
applicationInfo -> Utils.getBadgedIcon(context, applicationInfo),
@@ -79,13 +78,13 @@
}
@VisibleForTesting
- ZenModesListAddModePreferenceController(Context context,
+ ZenModesListAddModePreferenceController(Context context, String key,
OnAddModeListener onAddModeListener, ZenServiceListing serviceListing,
ConfigurationActivityHelper configurationActivityHelper,
NotificationManager notificationManager, PackageManager packageManager,
Function<ApplicationInfo, Drawable> appIconRetriever,
ExecutorService backgroundExecutor, Executor uiThreadExecutor) {
- super(context, KEY);
+ super(context, key);
mOnAddModeListener = onAddModeListener;
mServiceListing = serviceListing;
mConfigurationActivityHelper = configurationActivityHelper;
diff --git a/src/com/android/settings/notification/modes/ZenModesListFragment.java b/src/com/android/settings/notification/modes/ZenModesListFragment.java
index 37772b3..9af048c 100644
--- a/src/com/android/settings/notification/modes/ZenModesListFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModesListFragment.java
@@ -58,7 +58,7 @@
ZenModesBackend backend, OnAddModeListener onAddModeListener) {
return ImmutableList.of(
new ZenModesListPreferenceController(context, backend, ZenIconLoader.getInstance()),
- new ZenModesListAddModePreferenceController(context, onAddModeListener)
+ new ZenModesListAddModePreferenceController(context, "add_mode", onAddModeListener)
);
}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceControllerTest.java
index 2db9171..6c172b3 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceControllerTest.java
@@ -85,7 +85,7 @@
mContext = RuntimeEnvironment.getApplication();
Function<ApplicationInfo, Drawable> appIconRetriever = appInfo -> new ColorDrawable();
- mController = new ZenModesListAddModePreferenceController(mContext, mListener,
+ mController = new ZenModesListAddModePreferenceController(mContext, "add_mode", mListener,
mZenServiceListing, mConfigurationActivityHelper, mNm, mPm, appIconRetriever,
MoreExecutors.newDirectExecutorService(), MoreExecutors.directExecutor());