Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6c5c1df authored by Alexander Roederer's avatar Alexander Roederer
Browse files

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
parent 3791aa5e

src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java

+5 −6
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ import java.util.concurrent.Executors; 
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 @@ class ZenModesListAddModePreferenceController extends BasePreferenceController { 
        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 @@ class ZenModesListAddModePreferenceController extends BasePreferenceController { 
    }



    @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;

src/com/android/settings/notification/modes/ZenModesListFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class ZenModesListFragment extends ZenModesFragmentBase { 
            ZenModesBackend backend, OnAddModeListener onAddModeListener) {

        return ImmutableList.of(

                new ZenModesListPreferenceController(context, backend, ZenIconLoader.getInstance()),

                new ZenModesListAddModePreferenceController(context, onAddModeListener)

                new ZenModesListAddModePreferenceController(context, "add_mode", onAddModeListener)

        );

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class ZenModesListAddModePreferenceControllerTest { 
        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());