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

Move ListAddMode PrefController key to constructor

Browse Source 
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
This commit is contained in:
Alexander Roederer
2024-09-17 15:47:42 +00:00
parent 3791aa5ee9
commit c6c5c1dfad
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java
View File

@@ -51,8 +51,6 @@ import java.util.concurrent.Executors;
import java.util.function.Function; import java.util.function.Function;
class ZenModesListAddModePreferenceController extends BasePreferenceController { class ZenModesListAddModePreferenceController extends BasePreferenceController {
protected static final String KEY = "add_mode";
private final ZenServiceListing mServiceListing; private final ZenServiceListing mServiceListing;
private final OnAddModeListener mOnAddModeListener; private final OnAddModeListener mOnAddModeListener;
@@ -70,8 +68,9 @@ class ZenModesListAddModePreferenceController extends BasePreferenceController {
void onAvailableModeTypesForAdd(List<ModeType> types); void onAvailableModeTypesForAdd(List<ModeType> types);
} }
ZenModesListAddModePreferenceController(Context context, OnAddModeListener onAddModeListener) { ZenModesListAddModePreferenceController(Context context, String key,
this(context, onAddModeListener, new ZenServiceListing(context), OnAddModeListener onAddModeListener) {
this(context, key, onAddModeListener, new ZenServiceListing(context),
new ConfigurationActivityHelper(context.getPackageManager()), new ConfigurationActivityHelper(context.getPackageManager()),
context.getSystemService(NotificationManager.class), context.getPackageManager(), context.getSystemService(NotificationManager.class), context.getPackageManager(),
applicationInfo -> Utils.getBadgedIcon(context, applicationInfo), applicationInfo -> Utils.getBadgedIcon(context, applicationInfo),
@@ -79,13 +78,13 @@ class ZenModesListAddModePreferenceController extends BasePreferenceController {
} }
@VisibleForTesting @VisibleForTesting
ZenModesListAddModePreferenceController(Context context, ZenModesListAddModePreferenceController(Context context, String key,
OnAddModeListener onAddModeListener, ZenServiceListing serviceListing, OnAddModeListener onAddModeListener, ZenServiceListing serviceListing,
ConfigurationActivityHelper configurationActivityHelper, ConfigurationActivityHelper configurationActivityHelper,
NotificationManager notificationManager, PackageManager packageManager, NotificationManager notificationManager, PackageManager packageManager,
Function<ApplicationInfo, Drawable> appIconRetriever, Function<ApplicationInfo, Drawable> appIconRetriever,
ExecutorService backgroundExecutor, Executor uiThreadExecutor) { ExecutorService backgroundExecutor, Executor uiThreadExecutor) {
super(context, KEY); super(context, key);
mOnAddModeListener = onAddModeListener; mOnAddModeListener = onAddModeListener;
mServiceListing = serviceListing; mServiceListing = serviceListing;
mConfigurationActivityHelper = configurationActivityHelper; mConfigurationActivityHelper = configurationActivityHelper;

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

@@ -58,7 +58,7 @@ public class ZenModesListFragment extends ZenModesFragmentBase {
ZenModesBackend backend, OnAddModeListener onAddModeListener) { ZenModesBackend backend, OnAddModeListener onAddModeListener) {
return ImmutableList.of( return ImmutableList.of(
new ZenModesListPreferenceController(context, backend, ZenIconLoader.getInstance()), new ZenModesListPreferenceController(context, backend, ZenIconLoader.getInstance()),
new ZenModesListAddModePreferenceController(context, onAddModeListener) new ZenModesListAddModePreferenceController(context, "add_mode", onAddModeListener)
); );
} }

2
tests/robotests/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceControllerTest.java
View File

@@ -85,7 +85,7 @@ public class ZenModesListAddModePreferenceControllerTest {
mContext = RuntimeEnvironment.getApplication(); mContext = RuntimeEnvironment.getApplication();
Function<ApplicationInfo, Drawable> appIconRetriever = appInfo -> new ColorDrawable(); Function<ApplicationInfo, Drawable> appIconRetriever = appInfo -> new ColorDrawable();
mController = new ZenModesListAddModePreferenceController(mContext, mListener, mController = new ZenModesListAddModePreferenceController(mContext, "add_mode", mListener,
mZenServiceListing, mConfigurationActivityHelper, mNm, mPm, appIconRetriever, mZenServiceListing, mConfigurationActivityHelper, mNm, mPm, appIconRetriever,
MoreExecutors.newDirectExecutorService(), MoreExecutors.directExecutor()); MoreExecutors.newDirectExecutorService(), MoreExecutors.directExecutor());