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

Merge changes from topic "b361144180-PreferenceControllerMixin" into main

Browse Source 
* changes:
  Move ListAddMode PrefController key to constructor
  ZenModesListAdd extend BasePreferenceContoller
This commit is contained in:
Treehugger Robot
2024-09-17 17:28:27 +00:00
committed by Android (Google) Code Review
parent 591d568d00 c6c5c1dfad
commit ad856d326f
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.settings.notification.modes; package com.android.settings.notification.modes;
import android.app.Flags;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
@@ -33,8 +34,8 @@ import androidx.annotation.WorkerThread;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@@ -49,8 +50,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.function.Function; import java.util.function.Function;
class ZenModesListAddModePreferenceController extends AbstractPreferenceController { class ZenModesListAddModePreferenceController extends BasePreferenceController {
private final ZenServiceListing mServiceListing; private final ZenServiceListing mServiceListing;
private final OnAddModeListener mOnAddModeListener; private final OnAddModeListener mOnAddModeListener;
@@ -68,8 +68,9 @@ class ZenModesListAddModePreferenceController extends AbstractPreferenceControll
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),
@@ -77,13 +78,13 @@ class ZenModesListAddModePreferenceController extends AbstractPreferenceControll
} }
@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); super(context, key);
mOnAddModeListener = onAddModeListener; mOnAddModeListener = onAddModeListener;
mServiceListing = serviceListing; mServiceListing = serviceListing;
mConfigurationActivityHelper = configurationActivityHelper; mConfigurationActivityHelper = configurationActivityHelper;
@@ -95,13 +96,8 @@ class ZenModesListAddModePreferenceController extends AbstractPreferenceControll
} }
@Override @Override
public boolean isAvailable() { public int getAvailabilityStatus() {
return true; return Flags.modesUi() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public String getPreferenceKey() {
return "add_mode";
} }
@Override @Override

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());