diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml index 06b3dced4e2..617f22a94b1 100644 --- a/res/xml/accessibility_autoclick_settings.xml +++ b/res/xml/accessibility_autoclick_settings.xml @@ -27,27 +27,27 @@ settings:searchable="false" settings:lottie_rawRes="@drawable/accessibility_dwell" /> - - - - - diff --git a/res/xml/accessibility_control_timeout_settings.xml b/res/xml/accessibility_control_timeout_settings.xml index e1a7df47726..aaa2c0682de 100644 --- a/res/xml/accessibility_control_timeout_settings.xml +++ b/res/xml/accessibility_control_timeout_settings.xml @@ -25,28 +25,28 @@ android:key="accessibility_control_timeout_banner" settings:lottie_rawRes="@raw/accessibility_timeout_banner"/> - - - - - diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml index d638b94460f..1b69dc671bc 100644 --- a/res/xml/accessibility_daltonizer_settings.xml +++ b/res/xml/accessibility_daltonizer_settings.xml @@ -32,24 +32,24 @@ android:title="@string/daltonizer_type" android:key="daltonizer_mode_category" > - - - - diff --git a/res/xml/notification_importance.xml b/res/xml/notification_importance.xml index 0ca00e6bd93..9dc2ee2a51d 100644 --- a/res/xml/notification_importance.xml +++ b/res/xml/notification_importance.xml @@ -17,16 +17,16 @@ - - - - diff --git a/res/xml/one_handed_settings.xml b/res/xml/one_handed_settings.xml index 2f5c091bdf0..523cf4db253 100644 --- a/res/xml/one_handed_settings.xml +++ b/res/xml/one_handed_settings.xml @@ -42,13 +42,13 @@ android:title="@string/one_handed_mode_swipe_down_category" settings:controller="com.android.settings.gestures.OneHandedPreferenceCategoryController"> - - - - - - - diff --git a/res/xml/zen_mode_restrict_notifications_settings.xml b/res/xml/zen_mode_restrict_notifications_settings.xml index 051c20855f1..8f9eb99b301 100644 --- a/res/xml/zen_mode_restrict_notifications_settings.xml +++ b/res/xml/zen_mode_restrict_notifications_settings.xml @@ -23,19 +23,19 @@ - - - diff --git a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java index a8bd6f0c0fa..2d624c33641 100644 --- a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java +++ b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java @@ -29,7 +29,7 @@ import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import com.google.common.primitives.Ints; @@ -40,7 +40,7 @@ import java.util.Map; * Controller class that control accessibility time out settings. */ public class AccessibilityTimeoutController extends AbstractPreferenceController implements - LifecycleObserver, RadioButtonPreference.OnClickListener, PreferenceControllerMixin { + LifecycleObserver, SelectorWithWidgetPreference.OnClickListener, PreferenceControllerMixin { static final String CONTENT_TIMEOUT_SETTINGS_SECURE = Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS; static final String CONTROL_TIMEOUT_SETTINGS_SECURE = @@ -54,7 +54,7 @@ public class AccessibilityTimeoutController extends AbstractPreferenceController private final ContentResolver mContentResolver; private final Resources mResources; private OnChangeListener mOnChangeListener; - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; private int mAccessibilityUiTimeoutValue; public AccessibilityTimeoutController(Context context, Lifecycle lifecycle, @@ -124,13 +124,13 @@ public class AccessibilityTimeoutController extends AbstractPreferenceController public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - mPreference = (RadioButtonPreference) + mPreference = (SelectorWithWidgetPreference) screen.findPreference(getPreferenceKey()); mPreference.setOnClickListener(this); } @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { int value = getTimeoutValueToKeyMap().get(mPreferenceKey); handlePreferenceChange(String.valueOf(value)); if (mOnChangeListener != null) { diff --git a/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java b/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java index f6f554e3db8..75d92294e84 100644 --- a/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java +++ b/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java @@ -30,7 +30,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import com.google.common.primitives.Ints; @@ -39,7 +39,7 @@ import java.util.Map; /** Controller class that control radio button of accessibility daltonizer settings. */ public class DaltonizerRadioButtonPreferenceController extends BasePreferenceController implements - LifecycleObserver, RadioButtonPreference.OnClickListener { + LifecycleObserver, SelectorWithWidgetPreference.OnClickListener { private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER; // pair the preference key and daltonizer value. @@ -49,7 +49,7 @@ public class DaltonizerRadioButtonPreferenceController extends BasePreferenceCon private final ContentResolver mContentResolver; private final Resources mResources; private DaltonizerRadioButtonPreferenceController.OnChangeListener mOnChangeListener; - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; private int mAccessibilityDaltonizerValue; public DaltonizerRadioButtonPreferenceController(Context context, String preferenceKey) { @@ -120,7 +120,7 @@ public class DaltonizerRadioButtonPreferenceController extends BasePreferenceCon @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - mPreference = (RadioButtonPreference) + mPreference = (SelectorWithWidgetPreference) screen.findPreference(getPreferenceKey()); mPreference.setOnClickListener(this); mPreference.setAppendixVisibility(View.GONE); @@ -128,7 +128,7 @@ public class DaltonizerRadioButtonPreferenceController extends BasePreferenceCon } @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { final int value = getDaltonizerValueToKeyMap().get(mPreferenceKey); handlePreferenceChange(String.valueOf(value)); if (mOnChangeListener != null) { diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java index 78f31dfb779..2bf17fdba79 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java @@ -35,7 +35,7 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.LayoutPreference; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import java.util.Map; @@ -43,7 +43,7 @@ import java.util.Map; * Controller class that controls accessibility autoclick settings. */ public class ToggleAutoclickPreferenceController extends BasePreferenceController implements - LifecycleObserver, RadioButtonPreference.OnClickListener, PreferenceControllerMixin { + LifecycleObserver, SelectorWithWidgetPreference.OnClickListener, PreferenceControllerMixin { @VisibleForTesting static final String CONTROL_AUTOCLICK_DELAY_SECURE = @@ -67,7 +67,7 @@ public class ToggleAutoclickPreferenceController extends BasePreferenceControlle private final ContentResolver mContentResolver; private final Resources mResources; private OnChangeListener mOnChangeListener; - private RadioButtonPreference mDelayModePref; + private SelectorWithWidgetPreference mDelayModePref; /** * Seek bar preference for autoclick delay value. The seek bar has values between 0 and @@ -109,7 +109,7 @@ public class ToggleAutoclickPreferenceController extends BasePreferenceControlle public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - mDelayModePref = (RadioButtonPreference) + mDelayModePref = (SelectorWithWidgetPreference) screen.findPreference(getPreferenceKey()); mDelayModePref.setOnClickListener(this); mSeekBerPreference = (LayoutPreference) screen.findPreference(KEY_AUTOCLICK_CUSTOM_SEEKBAR); @@ -117,7 +117,7 @@ public class ToggleAutoclickPreferenceController extends BasePreferenceControlle } @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { final int value = mAccessibilityAutoclickKeyToValueMap.get(mPreferenceKey); handleRadioButtonPreferenceChange(value); if (mOnChangeListener != null) { diff --git a/src/com/android/settings/applications/OpenSupportedLinks.java b/src/com/android/settings/applications/OpenSupportedLinks.java index 84b03f173d1..4f5f2a8001c 100644 --- a/src/com/android/settings/applications/OpenSupportedLinks.java +++ b/src/com/android/settings/applications/OpenSupportedLinks.java @@ -34,13 +34,13 @@ import androidx.preference.PreferenceCategory; import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.widget.FooterPreference; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; /** * Display the Open Supported Links page. Allow users choose what kind supported links they need. */ public class OpenSupportedLinks extends AppInfoWithHeader implements - RadioButtonPreference.OnClickListener { + SelectorWithWidgetPreference.OnClickListener { private static final String TAG = "OpenSupportedLinks"; private static final String RADIO_GROUP_KEY = "supported_links_radio_group"; private static final String FOOTER_KEY = "supported_links_footer"; @@ -60,11 +60,11 @@ public class OpenSupportedLinks extends AppInfoWithHeader implements @VisibleForTesting PreferenceCategory mPreferenceCategory; @VisibleForTesting - RadioButtonPreference mAllowOpening; + SelectorWithWidgetPreference mAllowOpening; @VisibleForTesting - RadioButtonPreference mAskEveryTime; + SelectorWithWidgetPreference mAskEveryTime; @VisibleForTesting - RadioButtonPreference mNotAllowed; + SelectorWithWidgetPreference mNotAllowed; @Override public void onCreate(Bundle savedInstanceState) { @@ -101,7 +101,7 @@ public class OpenSupportedLinks extends AppInfoWithHeader implements } @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { final int clickedIndex = preferenceKeyToIndex(preference.getKey()); if (mCurrentIndex != clickedIndex) { mCurrentIndex = clickedIndex; @@ -110,8 +110,8 @@ public class OpenSupportedLinks extends AppInfoWithHeader implements } } - private RadioButtonPreference makeRadioPreference(String key, int stringId) { - final RadioButtonPreference pref = new RadioButtonPreference( + private SelectorWithWidgetPreference makeRadioPreference(String key, int stringId) { + final SelectorWithWidgetPreference pref = new SelectorWithWidgetPreference( mPreferenceCategory.getContext()); pref.setKey(key); pref.setTitle(stringId); diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java index 0ca1876f230..b089dd8384a 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java @@ -35,7 +35,7 @@ import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.widget.CandidateInfo; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; /** * A generic app picker fragment that shows a list of app as radio button group. @@ -53,7 +53,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment } @Override - public void onRadioButtonClicked(RadioButtonPreference selected) { + public void onRadioButtonClicked(SelectorWithWidgetPreference selected) { final String selectedKey = selected.getKey(); final CharSequence confirmationMessage = getConfirmationMessage(getCandidate(selectedKey)); final FragmentActivity activity = getActivity(); @@ -78,7 +78,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment } @Override - public void bindPreferenceExtra(RadioButtonPreference pref, + public void bindPreferenceExtra(SelectorWithWidgetPreference pref, String key, CandidateInfo info, String defaultKey, String systemDefaultKey) { if (!(info instanceof DefaultAppInfo)) { return; diff --git a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java index 72e5c9b87bf..9e1941aec8d 100644 --- a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java +++ b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java @@ -26,7 +26,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; import android.content.pm.UserInfo; -import android.os.UserHandle; import android.util.Log; import android.util.Pair; import android.view.View; @@ -35,13 +34,12 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.Utils; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.FooterPreference; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import java.util.ArrayList; import java.util.List; @@ -169,7 +167,7 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment { @Override - public void bindPreferenceExtra(RadioButtonPreference pref, + public void bindPreferenceExtra(SelectorWithWidgetPreference pref, String key, CandidateInfo info, String defaultKey, String systemDefaultKey) { super.bindPreferenceExtra(pref, key, info, defaultKey, systemDefaultKey); pref.setAppendixVisibility(View.GONE); diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java index 97906703069..d9bd4b29cfa 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java @@ -36,7 +36,7 @@ import com.android.settings.Utils; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.FooterPreference; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import com.google.android.collect.Lists; @@ -214,7 +214,7 @@ public class UsbDefaultFragment extends RadioButtonPickerFragment { private void refresh(long functions) { final PreferenceScreen screen = getPreferenceScreen(); for (long option : UsbDetailsFunctionsController.FUNCTIONS_MAP.keySet()) { - final RadioButtonPreference pref = + final SelectorWithWidgetPreference pref = screen.findPreference(UsbBackend.usbFunctionsToString(option)); if (pref != null) { final boolean isSupported = mUsbBackend.areFunctionsSupported(option); diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java index 411bc1dce89..6d455a69ebd 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java @@ -27,20 +27,20 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; /** * This class controls the radio buttons for switching between * USB device and host mode. */ public class UsbDetailsDataRoleController extends UsbDetailsController - implements RadioButtonPreference.OnClickListener { + implements SelectorWithWidgetPreference.OnClickListener { private PreferenceCategory mPreferenceCategory; - private RadioButtonPreference mDevicePref; - private RadioButtonPreference mHostPref; + private SelectorWithWidgetPreference mDevicePref; + private SelectorWithWidgetPreference mHostPref; - private RadioButtonPreference mNextRolePref; + private SelectorWithWidgetPreference mNextRolePref; private final Runnable mFailureCallback = () -> { if (mNextRolePref != null) { @@ -97,7 +97,7 @@ public class UsbDetailsDataRoleController extends UsbDetailsController } @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { int role = UsbBackend.dataRoleFromString(preference.getKey()); if (role != mUsbBackend.getDataRole() && mNextRolePref == null && !Utils.isMonkeyRunning()) { @@ -121,8 +121,9 @@ public class UsbDetailsDataRoleController extends UsbDetailsController return "usb_details_data_role"; } - private RadioButtonPreference makeRadioPreference(String key, int titleId) { - RadioButtonPreference pref = new RadioButtonPreference(mPreferenceCategory.getContext()); + private SelectorWithWidgetPreference makeRadioPreference(String key, int titleId) { + SelectorWithWidgetPreference pref = new SelectorWithWidgetPreference( + mPreferenceCategory.getContext()); pref.setKey(key); pref.setTitle(titleId); pref.setOnClickListener(this); diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java index 006f72a39ef..b887bd704f4 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java @@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import java.util.LinkedHashMap; import java.util.Map; @@ -40,7 +40,7 @@ import java.util.Map; * This class controls the radio buttons for choosing between different USB functions. */ public class UsbDetailsFunctionsController extends UsbDetailsController - implements RadioButtonPreference.OnClickListener { + implements SelectorWithWidgetPreference.OnClickListener { private static final String TAG = "UsbFunctionsCtrl"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -83,10 +83,10 @@ public class UsbDetailsFunctionsController extends UsbDetailsController /** * Gets a switch preference for the particular option, creating it if needed. */ - private RadioButtonPreference getProfilePreference(String key, int titleId) { - RadioButtonPreference pref = mProfilesContainer.findPreference(key); + private SelectorWithWidgetPreference getProfilePreference(String key, int titleId) { + SelectorWithWidgetPreference pref = mProfilesContainer.findPreference(key); if (pref == null) { - pref = new RadioButtonPreference(mProfilesContainer.getContext()); + pref = new SelectorWithWidgetPreference(mProfilesContainer.getContext()); pref.setKey(key); pref.setTitle(titleId); pref.setSingleLineTitle(false); @@ -108,7 +108,7 @@ public class UsbDetailsFunctionsController extends UsbDetailsController // Functions are only available in device mode mProfilesContainer.setEnabled(true); } - RadioButtonPreference pref; + SelectorWithWidgetPreference pref; for (long option : FUNCTIONS_MAP.keySet()) { int title = FUNCTIONS_MAP.get(option); pref = getProfilePreference(UsbBackend.usbFunctionsToString(option), title); @@ -128,7 +128,7 @@ public class UsbDetailsFunctionsController extends UsbDetailsController } @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { final long function = UsbBackend.usbFunctionsFromString(preference.getKey()); final long previousFunction = mUsbBackend.getCurrentFunctions(); if (DEBUG) { @@ -142,8 +142,8 @@ public class UsbDetailsFunctionsController extends UsbDetailsController mPreviousFunction = previousFunction; //Update the UI in advance to make it looks smooth - final RadioButtonPreference prevPref = - (RadioButtonPreference) mProfilesContainer.findPreference( + final SelectorWithWidgetPreference prevPref = + (SelectorWithWidgetPreference) mProfilesContainer.findPreference( UsbBackend.usbFunctionsToString(mPreviousFunction)); if (prevPref != null) { prevPref.setChecked(false); diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java index 18d10491e90..f8c03d5245f 100644 --- a/src/com/android/settings/display/ScreenTimeoutSettings.java +++ b/src/com/android/settings/display/ScreenTimeoutSettings.java @@ -53,7 +53,7 @@ import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.FooterPreference; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import com.google.common.annotations.VisibleForTesting; @@ -181,8 +181,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements } for (CandidateInfo info : candidateList) { - RadioButtonPreference pref = - new RadioButtonPreference(getPrefContext()); + SelectorWithWidgetPreference pref = + new SelectorWithWidgetPreference(getPrefContext()); bindPreference(pref, info.getKey(), info, defaultKey); screen.addPreference(pref); } @@ -192,8 +192,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements if (!candidateList.isEmpty() && (selectedTimeout > maxTimeout)) { // The selected time out value is longer than the max timeout allowed by the admin. // Select the largest value from the list by default. - final RadioButtonPreference preferenceWithLargestTimeout = - (RadioButtonPreference) screen.getPreference(candidateList.size() - 1); + final SelectorWithWidgetPreference preferenceWithLargestTimeout = + (SelectorWithWidgetPreference) screen.getPreference(candidateList.size() - 1); preferenceWithLargestTimeout.setChecked(true); } diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 3319e1b1492..0bce57d526e 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -53,7 +53,7 @@ import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.utils.StringUtil; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.LayoutPreference; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import java.util.ArrayList; import java.util.List; @@ -66,7 +66,8 @@ import java.util.List; */ public class AdvancedPowerUsageDetail extends DashboardFragment implements ButtonActionDialogFragment.AppButtonsDialogListener, - BatteryTipPreferenceController.BatteryTipListener, RadioButtonPreference.OnClickListener { + BatteryTipPreferenceController.BatteryTipListener, + SelectorWithWidgetPreference.OnClickListener { public static final String TAG = "AdvancedPowerDetail"; public static final String EXTRA_UID = "extra_uid"; @@ -107,11 +108,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements @VisibleForTesting FooterPreference mFooterPreference; @VisibleForTesting - RadioButtonPreference mRestrictedPreference; + SelectorWithWidgetPreference mRestrictedPreference; @VisibleForTesting - RadioButtonPreference mOptimizePreference; + SelectorWithWidgetPreference mOptimizePreference; @VisibleForTesting - RadioButtonPreference mUnrestrictedPreference; + SelectorWithWidgetPreference mUnrestrictedPreference; @VisibleForTesting boolean enableTriState = true; @@ -385,8 +386,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements final String packageName = bundle.getString(EXTRA_PACKAGE_NAME); mAppButtonsPreferenceController = new AppButtonsPreferenceController( - (SettingsActivity) getActivity(), this, getSettingsLifecycle(), packageName, - mState, REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN); + (SettingsActivity) getActivity(), this, getSettingsLifecycle(), + packageName, mState, REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN); controllers.add(mAppButtonsPreferenceController); if (enableTriState) { controllers.add(new UnrestrictedPreferenceController(context, uid, packageName)); @@ -425,7 +426,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements } @Override - public void onRadioButtonClicked(RadioButtonPreference selected) { + public void onRadioButtonClicked(SelectorWithWidgetPreference selected) { final String selectedKey = selected.getKey(); updatePreferenceState(mUnrestrictedPreference, selectedKey); updatePreferenceState(mOptimizePreference, selectedKey); @@ -452,7 +453,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements } } - private void updatePreferenceState(RadioButtonPreference preference, String selectedKey) { + private void updatePreferenceState(SelectorWithWidgetPreference preference, + String selectedKey) { preference.setChecked(selectedKey.equals(preference.getKey())); } diff --git a/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java b/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java index b2da35632ea..4d062c23d88 100644 --- a/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java +++ b/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java @@ -26,7 +26,7 @@ import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class OptimizedPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { @@ -51,19 +51,19 @@ public class OptimizedPreferenceController extends AbstractPreferenceController if (!mBatteryOptimizeUtils.isValidPackageName()) { Log.d(TAG, "invalid package name, optimized states only"); preference.setEnabled(true); - ((RadioButtonPreference) preference).setChecked(true); + ((SelectorWithWidgetPreference) preference).setChecked(true); return; } if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) { Log.d(TAG, "is system or default app, disable pref"); - ((RadioButtonPreference) preference).setChecked(false); + ((SelectorWithWidgetPreference) preference).setChecked(false); preference.setEnabled(false); } else if (mBatteryOptimizeUtils.getAppUsageState() == OPTIMIZED) { Log.d(TAG, "is optimized states"); - ((RadioButtonPreference) preference).setChecked(true); + ((SelectorWithWidgetPreference) preference).setChecked(true); } else { - ((RadioButtonPreference) preference).setChecked(false); + ((SelectorWithWidgetPreference) preference).setChecked(false); } } diff --git a/src/com/android/settings/fuelgauge/RestrictedPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictedPreferenceController.java index b52af578e13..bc5d1e01555 100644 --- a/src/com/android/settings/fuelgauge/RestrictedPreferenceController.java +++ b/src/com/android/settings/fuelgauge/RestrictedPreferenceController.java @@ -27,7 +27,7 @@ import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class RestrictedPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { @@ -55,13 +55,13 @@ public class RestrictedPreferenceController extends AbstractPreferenceController if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) { Log.d(TAG, "is system or default app, disable pref"); - ((RadioButtonPreference) preference).setChecked(false); + ((SelectorWithWidgetPreference) preference).setChecked(false); preference.setEnabled(false); } else if (mBatteryOptimizeUtils.getAppUsageState() == RESTRICTED) { Log.d(TAG, "is restricted states"); - ((RadioButtonPreference) preference).setChecked(true); + ((SelectorWithWidgetPreference) preference).setChecked(true); } else { - ((RadioButtonPreference) preference).setChecked(false); + ((SelectorWithWidgetPreference) preference).setChecked(false); } } diff --git a/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java b/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java index 36141c52abd..73eff6e3391 100644 --- a/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java +++ b/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java @@ -26,7 +26,7 @@ import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class UnrestrictedPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { @@ -54,12 +54,12 @@ public class UnrestrictedPreferenceController extends AbstractPreferenceControll if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) { Log.d(TAG, "is system or default app, unrestricted states only"); - ((RadioButtonPreference) preference).setChecked(true); + ((SelectorWithWidgetPreference) preference).setChecked(true); } else if (mBatteryOptimizeUtils.getAppUsageState() == UNRESTRICTED) { Log.d(TAG, "is unrestricted states"); - ((RadioButtonPreference) preference).setChecked(true); + ((SelectorWithWidgetPreference) preference).setChecked(true); } else { - ((RadioButtonPreference) preference).setChecked(false); + ((SelectorWithWidgetPreference) preference).setChecked(false); } } diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java index 507c36949d5..afe58535ef9 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java @@ -37,7 +37,7 @@ import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.fuelgauge.BatterySaverUtils; import com.android.settingslib.widget.CandidateInfo; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import com.google.common.collect.Lists; @@ -142,8 +142,8 @@ public class BatterySaverScheduleSettings extends RadioButtonPickerFragment { } @Override - public void bindPreferenceExtra(RadioButtonPreference pref, String key, CandidateInfo info, - String defaultKey, String systemDefaultKey) { + public void bindPreferenceExtra(SelectorWithWidgetPreference pref, String key, + CandidateInfo info, String defaultKey, String systemDefaultKey) { final BatterySaverScheduleCandidateInfo candidateInfo = (BatterySaverScheduleCandidateInfo) info; final CharSequence summary = candidateInfo.getSummary(); diff --git a/src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java b/src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java index 26b37630d2b..209aee3a59d 100644 --- a/src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java +++ b/src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java @@ -26,7 +26,7 @@ import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; /** * The controller to handle one-handed mode pull screen into reach preference. @@ -46,8 +46,8 @@ public class OneHandedActionPullDownPrefController extends BasePreferenceControl @Override public void updateState(Preference preference) { super.updateState(preference); - if (preference instanceof RadioButtonPreference) { - ((RadioButtonPreference) preference).setChecked( + if (preference instanceof SelectorWithWidgetPreference) { + ((SelectorWithWidgetPreference) preference).setChecked( !OneHandedSettingsUtils.isSwipeDownNotificationEnabled(mContext)); } } @@ -65,8 +65,8 @@ public class OneHandedActionPullDownPrefController extends BasePreferenceControl return false; } OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, false); - if (preference instanceof RadioButtonPreference) { - ((RadioButtonPreference) preference).setChecked(true); + if (preference instanceof SelectorWithWidgetPreference) { + ((SelectorWithWidgetPreference) preference).setChecked(true); } return true; } diff --git a/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java b/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java index 524c135af5e..939a37bb94e 100644 --- a/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java +++ b/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java @@ -26,7 +26,7 @@ import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; /** * The controller to handle one-handed mode show notification preference. @@ -46,8 +46,8 @@ public class OneHandedActionShowNotificationPrefController extends BasePreferenc @Override public void updateState(Preference preference) { super.updateState(preference); - if (preference instanceof RadioButtonPreference) { - ((RadioButtonPreference) preference).setChecked( + if (preference instanceof SelectorWithWidgetPreference) { + ((SelectorWithWidgetPreference) preference).setChecked( OneHandedSettingsUtils.isSwipeDownNotificationEnabled(mContext)); } } @@ -65,8 +65,8 @@ public class OneHandedActionShowNotificationPrefController extends BasePreferenc return false; } OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, true); - if (preference instanceof RadioButtonPreference) { - ((RadioButtonPreference) preference).setChecked(true); + if (preference instanceof SelectorWithWidgetPreference) { + ((SelectorWithWidgetPreference) preference).setChecked(true); } return true; } diff --git a/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java b/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java index 2f89c16131d..d171677d72a 100644 --- a/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java @@ -35,10 +35,10 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class PreventRingingGesturePreferenceController extends AbstractPreferenceController - implements RadioButtonPreference.OnClickListener, LifecycleObserver, + implements SelectorWithWidgetPreference.OnClickListener, LifecycleObserver, OnResume, OnPause, PreferenceControllerMixin { @VisibleForTesting @@ -54,9 +54,9 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc @VisibleForTesting PreferenceCategory mPreferenceCategory; @VisibleForTesting - RadioButtonPreference mVibratePref; + SelectorWithWidgetPreference mVibratePref; @VisibleForTesting - RadioButtonPreference mMutePref; + SelectorWithWidgetPreference mMutePref; private SettingObserver mSettingObserver; @@ -100,7 +100,7 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc } @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { int preventRingingSetting = keyToSetting(preference.getKey()); if (preventRingingSetting != Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE)) { @@ -157,8 +157,9 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc } } - private RadioButtonPreference makeRadioPreference(String key, int titleId) { - RadioButtonPreference pref = new RadioButtonPreference(mPreferenceCategory.getContext()); + private SelectorWithWidgetPreference makeRadioPreference(String key, int titleId) { + SelectorWithWidgetPreference pref = new SelectorWithWidgetPreference( + mPreferenceCategory.getContext()); pref.setKey(key); pref.setTitle(titleId); pref.setOnClickListener(this); diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java index 4b9cfa36f2f..aa0c84b66de 100644 --- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java +++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java @@ -48,7 +48,7 @@ import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.IllustrationPreference; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import java.util.ArrayList; import java.util.List; @@ -109,8 +109,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i return; } for (CandidateInfo info : candidateList) { - RadioButtonPreference pref = - new RadioButtonPreference(getPrefContext()); + SelectorWithWidgetPreference pref = + new SelectorWithWidgetPreference(getPrefContext()); bindPreference(pref, info.getKey(), info, defaultKey); bindPreferenceExtra(pref, info.getKey(), info, defaultKey, systemDefaultKey); screen.addPreference(pref); @@ -119,7 +119,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i } @Override - public void bindPreferenceExtra(RadioButtonPreference pref, + public void bindPreferenceExtra(SelectorWithWidgetPreference pref, String key, CandidateInfo info, String defaultKey, String systemDefaultKey) { if (!(info instanceof CandidateInfoExtra)) { return; diff --git a/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java index 5afe0b63326..a8387a3e41f 100644 --- a/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java @@ -35,7 +35,7 @@ import com.android.settings.core.SubSettingLauncher; import com.android.settings.notification.NotificationBackend; import com.android.settings.notification.app.ConversationListSettings; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import java.util.ArrayList; import java.util.HashMap; @@ -58,7 +58,7 @@ public class ZenModePriorityConversationsPreferenceController private int mNumImportantConversations = UNSET; private int mNumConversations = UNSET; private PreferenceCategory mPreferenceCategory; - private List mRadioButtonPreferences = new ArrayList<>(); + private List mSelectorWithWidgetPreferences = new ArrayList<>(); private Context mPreferenceScreenContext; public ZenModePriorityConversationsPreferenceController(Context context, String key, @@ -101,7 +101,7 @@ public class ZenModePriorityConversationsPreferenceController public void updateState(Preference preference) { final int currSetting = mBackend.getPriorityConversationSenders(); - for (RadioButtonPreference pref : mRadioButtonPreferences) { + for (SelectorWithWidgetPreference pref : mSelectorWithWidgetPreferences) { pref.setChecked(keyToSetting(pref.getKey()) == currSetting); pref.setSummary(getSummary(pref.getKey())); } @@ -181,9 +181,9 @@ public class ZenModePriorityConversationsPreferenceController }.execute(); } - private RadioButtonPreference makeRadioPreference(String key, int titleId) { - final RadioButtonPreference pref = - new RadioButtonPreference(mPreferenceCategory.getContext()); + private SelectorWithWidgetPreference makeRadioPreference(String key, int titleId) { + final SelectorWithWidgetPreference pref = + new SelectorWithWidgetPreference(mPreferenceCategory.getContext()); if (KEY_ALL.equals(key) || KEY_IMPORTANT.equals(key)) { pref.setExtraWidgetOnClickListener(mConversationSettingsWidgetClickListener); } @@ -191,7 +191,7 @@ public class ZenModePriorityConversationsPreferenceController pref.setTitle(titleId); pref.setOnClickListener(mRadioButtonClickListener); mPreferenceCategory.addPreference(pref); - mRadioButtonPreferences.add(pref); + mSelectorWithWidgetPreferences.add(pref); return pref; } @@ -206,10 +206,10 @@ public class ZenModePriorityConversationsPreferenceController } }; - private RadioButtonPreference.OnClickListener mRadioButtonClickListener = - new RadioButtonPreference.OnClickListener() { + private SelectorWithWidgetPreference.OnClickListener mRadioButtonClickListener = + new SelectorWithWidgetPreference.OnClickListener() { @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { int selectedConversationSetting = keyToSetting(preference.getKey()); if (selectedConversationSetting != mBackend.getPriorityConversationSenders()) { mBackend.saveConversationSenders(selectedConversationSetting); diff --git a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java index 482865c40ab..065614c24e9 100644 --- a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java @@ -33,7 +33,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import java.util.ArrayList; import java.util.List; @@ -63,7 +63,7 @@ public class ZenModePrioritySendersPreferenceController private final boolean mIsMessages; // if this is false, then this preference is for calls private PreferenceCategory mPreferenceCategory; - private List mRadioButtonPreferences = new ArrayList<>(); + private List mSelectorWithWidgetPreferences = new ArrayList<>(); public ZenModePrioritySendersPreferenceController(Context context, String key, Lifecycle lifecycle, boolean isMessages) { @@ -110,7 +110,7 @@ public class ZenModePrioritySendersPreferenceController public void updateState(Preference preference) { final int currSetting = getPrioritySenders(); - for (RadioButtonPreference pref : mRadioButtonPreferences) { + for (SelectorWithWidgetPreference pref : mSelectorWithWidgetPreferences) { pref.setChecked(keyToSetting(pref.getKey()) == currSetting); } } @@ -122,7 +122,7 @@ public class ZenModePrioritySendersPreferenceController } private void updateSummaries() { - for (RadioButtonPreference pref : mRadioButtonPreferences) { + for (SelectorWithWidgetPreference pref : mSelectorWithWidgetPreferences) { pref.setSummary(getSummary(pref.getKey())); } } @@ -165,9 +165,9 @@ public class ZenModePrioritySendersPreferenceController } } - private RadioButtonPreference makeRadioPreference(String key, int titleId) { - final RadioButtonPreference pref = - new RadioButtonPreference(mPreferenceCategory.getContext()); + private SelectorWithWidgetPreference makeRadioPreference(String key, int titleId) { + final SelectorWithWidgetPreference pref = + new SelectorWithWidgetPreference(mPreferenceCategory.getContext()); pref.setKey(key); pref.setTitle(titleId); pref.setOnClickListener(mRadioButtonClickListener); @@ -178,14 +178,14 @@ public class ZenModePrioritySendersPreferenceController } mPreferenceCategory.addPreference(pref); - mRadioButtonPreferences.add(pref); + mSelectorWithWidgetPreferences.add(pref); return pref; } - private RadioButtonPreference.OnClickListener mRadioButtonClickListener = - new RadioButtonPreference.OnClickListener() { + private SelectorWithWidgetPreference.OnClickListener mRadioButtonClickListener = + new SelectorWithWidgetPreference.OnClickListener() { @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { int selectedSetting = keyToSetting(preference.getKey()); if (selectedSetting != getPrioritySenders()) { mBackend.saveSenders( diff --git a/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java index 735ce7915b5..1a514a06e3a 100644 --- a/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java @@ -24,13 +24,13 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class ZenModeVisEffectsAllPreferenceController extends AbstractZenModePreferenceController - implements RadioButtonPreference.OnClickListener { + implements SelectorWithWidgetPreference.OnClickListener { - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF | Policy.SUPPRESSED_EFFECT_SCREEN_ON @@ -69,7 +69,7 @@ public class ZenModeVisEffectsAllPreferenceController } @Override - public void onRadioButtonClicked(RadioButtonPreference p) { + public void onRadioButtonClicked(SelectorWithWidgetPreference p) { mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_SOUND_AND_VIS_EFFECTS, true); mBackend.saveVisualEffectsPolicy(EFFECTS, true); diff --git a/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java index 535dca3976a..cd557e4a27a 100644 --- a/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java @@ -26,12 +26,12 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class ZenModeVisEffectsCustomPreferenceController extends AbstractZenModePreferenceController { - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; protected static final int INTERRUPTIVE_EFFECTS = NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT diff --git a/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java index 8723ea8dc43..a815a0c1fc5 100644 --- a/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java @@ -24,13 +24,13 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class ZenModeVisEffectsNonePreferenceController extends AbstractZenModePreferenceController - implements RadioButtonPreference.OnClickListener { + implements SelectorWithWidgetPreference.OnClickListener { - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF | Policy.SUPPRESSED_EFFECT_SCREEN_ON @@ -68,7 +68,7 @@ public class ZenModeVisEffectsNonePreferenceController } @Override - public void onRadioButtonClicked(RadioButtonPreference preference) { + public void onRadioButtonClicked(SelectorWithWidgetPreference preference) { mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_SOUND_ONLY, true); mBackend.saveVisualEffectsPolicy(EFFECTS, false); diff --git a/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java index 2cf8679326f..e47dc7efee9 100644 --- a/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java @@ -25,12 +25,12 @@ import androidx.preference.PreferenceScreen; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class ZenRuleCustomPolicyPreferenceController extends AbstractZenCustomRulePreferenceController { - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; public ZenRuleCustomPolicyPreferenceController(Context context, Lifecycle lifecycle, String key) { diff --git a/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java index 372f1524443..c1d00142443 100644 --- a/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java @@ -26,12 +26,12 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class ZenRuleDefaultPolicyPreferenceController extends AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin { - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; public ZenRuleDefaultPolicyPreferenceController(Context context, Lifecycle lifecycle, String key) { diff --git a/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java index 6e9152fa301..0f9691cce59 100644 --- a/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java @@ -27,12 +27,12 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class ZenRuleVisEffectsAllPreferenceController extends AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin { - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; public ZenRuleVisEffectsAllPreferenceController(Context context, Lifecycle lifecycle, String key) { diff --git a/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java index d7c5f86cc36..0c123bccada 100644 --- a/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java @@ -27,12 +27,12 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class ZenRuleVisEffectsCustomPreferenceController extends AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin { - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; public ZenRuleVisEffectsCustomPreferenceController(Context context, Lifecycle lifecycle, String key) { diff --git a/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java index 5484ed50ddb..49d67eac1ec 100644 --- a/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java @@ -27,12 +27,12 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; public class ZenRuleVisEffectsNonePreferenceController extends AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin { - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; public ZenRuleVisEffectsNonePreferenceController(Context context, Lifecycle lifecycle, String key) { diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java index 7d765df60fc..0b597145b1c 100644 --- a/src/com/android/settings/widget/RadioButtonPickerFragment.java +++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java @@ -38,7 +38,7 @@ import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.PreferenceXmlParserUtils; import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag; import com.android.settingslib.widget.CandidateInfo; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.xmlpull.v1.XmlPullParserException; @@ -47,7 +47,7 @@ import java.util.List; import java.util.Map; public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFragment implements - RadioButtonPreference.OnClickListener { + SelectorWithWidgetPreference.OnClickListener { @VisibleForTesting static final String EXTRA_FOR_WORK = "for_work"; @@ -110,7 +110,7 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr protected abstract int getPreferenceScreenResId(); @Override - public void onRadioButtonClicked(RadioButtonPreference selected) { + public void onRadioButtonClicked(SelectorWithWidgetPreference selected) { final String selectedKey = selected.getKey(); onRadioButtonConfirmed(selectedKey); } @@ -150,7 +150,7 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr /** * A chance for subclasses to bind additional things to the preference. */ - public void bindPreferenceExtra(RadioButtonPreference pref, + public void bindPreferenceExtra(SelectorWithWidgetPreference pref, String key, CandidateInfo info, String defaultKey, String systemDefaultKey) { } @@ -175,7 +175,8 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr final int customLayoutResId = getRadioButtonPreferenceCustomLayoutResId(); if (shouldShowItemNone()) { - final RadioButtonPreference nonePref = new RadioButtonPreference(getPrefContext()); + final SelectorWithWidgetPreference nonePref = + new SelectorWithWidgetPreference(getPrefContext()); if (customLayoutResId > 0) { nonePref.setLayoutResource(customLayoutResId); } @@ -187,7 +188,8 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr } if (candidateList != null) { for (CandidateInfo info : candidateList) { - RadioButtonPreference pref = new RadioButtonPreference(getPrefContext()); + SelectorWithWidgetPreference pref = + new SelectorWithWidgetPreference(getPrefContext()); if (customLayoutResId > 0) { pref.setLayoutResource(customLayoutResId); } @@ -202,7 +204,7 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr } } - public RadioButtonPreference bindPreference(RadioButtonPreference pref, + public SelectorWithWidgetPreference bindPreference(SelectorWithWidgetPreference pref, String key, CandidateInfo info, String defaultKey) { pref.setTitle(info.loadLabel()); pref.setIcon(Utils.getSafeIcon(info.loadIcon())); @@ -221,8 +223,9 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr final int count = screen.getPreferenceCount(); for (int i = 0; i < count; i++) { final Preference pref = screen.getPreference(i); - if (pref instanceof RadioButtonPreference) { - final RadioButtonPreference radioPref = (RadioButtonPreference) pref; + if (pref instanceof SelectorWithWidgetPreference) { + final SelectorWithWidgetPreference radioPref = + (SelectorWithWidgetPreference) pref; final boolean newCheckedState = TextUtils.equals(pref.getKey(), selectedKey); if (radioPref.isChecked() != newCheckedState) { radioPref.setChecked(TextUtils.equals(pref.getKey(), selectedKey)); @@ -237,8 +240,8 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr // If there is only 1 thing on screen, select it. if (screen != null && screen.getPreferenceCount() == 1) { final Preference onlyPref = screen.getPreference(0); - if (onlyPref instanceof RadioButtonPreference) { - ((RadioButtonPreference) onlyPref).setChecked(true); + if (onlyPref instanceof SelectorWithWidgetPreference) { + ((SelectorWithWidgetPreference) onlyPref).setChecked(true); } } } diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java index 7fefef60276..fc9fefb4bad 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java @@ -32,7 +32,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -50,7 +50,7 @@ public class AccessibilityTimeoutControllerTest private AccessibilityTimeoutController mController; @Mock - private RadioButtonPreference mMockPref; + private SelectorWithWidgetPreference mMockPref; private Context mContext; private ContentResolver mContentResolver; diff --git a/tests/robotests/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceControllerTest.java index 5ec4bf43923..28954c5a993 100644 --- a/tests/robotests/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceControllerTest.java @@ -31,7 +31,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -51,7 +51,7 @@ public class DaltonizerRadioButtonPreferenceControllerTest implements private DaltonizerRadioButtonPreferenceController mController; @Mock - private RadioButtonPreference mMockPref; + private SelectorWithWidgetPreference mMockPref; private Context mContext; @Mock diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java index edc2992a1c1..1b7f326192b 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java @@ -42,8 +42,8 @@ import androidx.test.core.app.ApplicationProvider; import com.android.settings.accessibility.ToggleAutoclickPreferenceController.OnChangeListener; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.LayoutPreference; -import com.android.settingslib.widget.RadioButtonPreference; -import com.android.settingslib.widget.RadioButtonPreference.OnClickListener; +import com.android.settingslib.widget.SelectorWithWidgetPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference.OnClickListener; import org.junit.Before; import org.junit.Test; @@ -62,7 +62,7 @@ public class ToggleAutoclickPreferenceControllerTest { private PreferenceScreen mScreen; @Mock - private RadioButtonPreference mDelayModePref; + private SelectorWithWidgetPreference mDelayModePref; @Mock private OnChangeListener mOnChangeListener; @@ -118,7 +118,7 @@ public class ToggleAutoclickPreferenceControllerTest { when(mAccessibilityAutoclickKeyToValueMap.get(mPrefKey)).thenReturn(AUTOCLICK_OFF_MODE); mController.displayPreference(mScreen); - mController.onRadioButtonClicked(any(RadioButtonPreference.class)); + mController.onRadioButtonClicked(any(SelectorWithWidgetPreference.class)); final boolean isEnabled = Secure.getInt(mContext.getContentResolver(), Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /* def= */ 0) == 1; final int delayMs = Secure.getInt(mContext.getContentResolver(), @@ -137,7 +137,7 @@ public class ToggleAutoclickPreferenceControllerTest { when(mAccessibilityAutoclickKeyToValueMap.get(mPrefKey)).thenReturn(AUTOCLICK_CUSTOM_MODE); mController.displayPreference(mScreen); - mController.onRadioButtonClicked(any(RadioButtonPreference.class)); + mController.onRadioButtonClicked(any(SelectorWithWidgetPreference.class)); final boolean isEnabled = Secure.getInt(mContext.getContentResolver(), Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /* def= */ 0) == 1; final int keyDelayMode = mSharedPreferences.getInt(KEY_DELAY_MODE, AUTOCLICK_CUSTOM_MODE); @@ -154,7 +154,7 @@ public class ToggleAutoclickPreferenceControllerTest { mController.setOnChangeListener(mOnChangeListener); mController.displayPreference(mScreen); - mController.onRadioButtonClicked(any(RadioButtonPreference.class)); + mController.onRadioButtonClicked(any(SelectorWithWidgetPreference.class)); verify(mOnChangeListener).onCheckedChanged(mDelayModePref); } diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java index 3e96847f667..2a63f53ea09 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -32,7 +32,7 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.applications.DefaultAppInfo; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -73,8 +73,8 @@ public class DefaultAppPickerFragmentTest { @Test public void clickPreference_hasConfirmation_shouldShowConfirmation() { mFragment.onAttach((Context) mActivity); - final RadioButtonPreference pref = - new RadioButtonPreference(RuntimeEnvironment.application); + final SelectorWithWidgetPreference pref = + new SelectorWithWidgetPreference(RuntimeEnvironment.application); pref.setKey("TEST"); doReturn("confirmation_text").when(mFragment) .getConfirmationMessage(any(DefaultAppInfo.class)); diff --git a/tests/robotests/src/com/android/settings/bugreporthandler/BugReportHandlerPickerTest.java b/tests/robotests/src/com/android/settings/bugreporthandler/BugReportHandlerPickerTest.java index fb48ad17f05..a3fdee6a5f4 100644 --- a/tests/robotests/src/com/android/settings/bugreporthandler/BugReportHandlerPickerTest.java +++ b/tests/robotests/src/com/android/settings/bugreporthandler/BugReportHandlerPickerTest.java @@ -39,7 +39,7 @@ import android.util.Pair; import androidx.fragment.app.FragmentActivity; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.After; import org.junit.Before; @@ -138,7 +138,7 @@ public class BugReportHandlerPickerTest { when(mBugReportHandlerUtil.setCurrentBugReportHandlerAppAndUser(any(), eq(PACKAGE_NAME), eq(USER_ID))).thenReturn(true); - RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class); + SelectorWithWidgetPreference defaultPackagePref = mock(SelectorWithWidgetPreference.class); when(defaultPackagePref.getKey()).thenReturn( BugReportHandlerPicker.getKey(PACKAGE_NAME, USER_ID)); mPicker.onRadioButtonClicked(defaultPackagePref); @@ -157,7 +157,7 @@ public class BugReportHandlerPickerTest { when(mBugReportHandlerUtil.setCurrentBugReportHandlerAppAndUser(any(), eq(PACKAGE_NAME), eq(USER_ID))).thenReturn(false); - RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class); + SelectorWithWidgetPreference defaultPackagePref = mock(SelectorWithWidgetPreference.class); when(defaultPackagePref.getKey()).thenReturn( BugReportHandlerPicker.getKey(PACKAGE_NAME, USER_ID)); mPicker.onRadioButtonClicked(defaultPackagePref); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java index a52207f3f86..8c8431d9688 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java @@ -39,7 +39,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -100,8 +100,8 @@ public class UsbDetailsDataRoleControllerTest { mDetailsDataRoleController.refresh(true, UsbManager.FUNCTION_NONE, POWER_ROLE_SINK, DATA_ROLE_DEVICE); - final RadioButtonPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); - final RadioButtonPreference hostPref = getRadioPreference(DATA_ROLE_HOST); + final SelectorWithWidgetPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); + final SelectorWithWidgetPreference hostPref = getRadioPreference(DATA_ROLE_HOST); assertThat(devicePref.isChecked()).isTrue(); assertThat(hostPref.isChecked()).isFalse(); } @@ -113,8 +113,8 @@ public class UsbDetailsDataRoleControllerTest { mDetailsDataRoleController.refresh(true, UsbManager.FUNCTION_NONE, POWER_ROLE_SINK, DATA_ROLE_HOST); - final RadioButtonPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); - final RadioButtonPreference hostPref = getRadioPreference(DATA_ROLE_HOST); + final SelectorWithWidgetPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); + final SelectorWithWidgetPreference hostPref = getRadioPreference(DATA_ROLE_HOST); assertThat(devicePref.isChecked()).isFalse(); assertThat(hostPref.isChecked()).isTrue(); } @@ -134,7 +134,7 @@ public class UsbDetailsDataRoleControllerTest { mDetailsDataRoleController.displayPreference(mScreen); when(mUsbBackend.getDataRole()).thenReturn(DATA_ROLE_HOST); - final RadioButtonPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); + final SelectorWithWidgetPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); devicePref.performClick(); verify(mUsbBackend).setDataRole(DATA_ROLE_DEVICE); @@ -147,7 +147,7 @@ public class UsbDetailsDataRoleControllerTest { mDetailsDataRoleController.displayPreference(mScreen); when(mUsbBackend.getDataRole()).thenReturn(DATA_ROLE_HOST); - final RadioButtonPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); + final SelectorWithWidgetPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); devicePref.performClick(); assertThat(devicePref.getSummary()) @@ -161,7 +161,7 @@ public class UsbDetailsDataRoleControllerTest { mDetailsDataRoleController.displayPreference(mScreen); when(mUsbBackend.getDataRole()).thenReturn(DATA_ROLE_HOST); - final RadioButtonPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); + final SelectorWithWidgetPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); devicePref.performClick(); verify(mUsbBackend).setDataRole(DATA_ROLE_DEVICE); @@ -179,7 +179,7 @@ public class UsbDetailsDataRoleControllerTest { mDetailsDataRoleController.displayPreference(mScreen); when(mUsbBackend.getDataRole()).thenReturn(DATA_ROLE_HOST); - final RadioButtonPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); + final SelectorWithWidgetPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); devicePref.performClick(); verify(mUsbBackend).setDataRole(DATA_ROLE_DEVICE); @@ -198,7 +198,7 @@ public class UsbDetailsDataRoleControllerTest { mDetailsDataRoleController.displayPreference(mScreen); when(mUsbBackend.getDataRole()).thenReturn(DATA_ROLE_HOST); - final RadioButtonPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); + final SelectorWithWidgetPreference devicePref = getRadioPreference(DATA_ROLE_DEVICE); devicePref.performClick(); verify(mUsbBackend).setDataRole(DATA_ROLE_DEVICE); @@ -214,8 +214,8 @@ public class UsbDetailsDataRoleControllerTest { .isEqualTo(mContext.getString(R.string.usb_switching_failed)); } - private RadioButtonPreference getRadioPreference(int role) { - return (RadioButtonPreference) + private SelectorWithWidgetPreference getRadioPreference(int role) { + return (SelectorWithWidgetPreference) mPreference.findPreference(UsbBackend.dataRoleToString(role)); } } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java index f94ab6a5d96..ae7e66abd62 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -41,7 +41,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -65,7 +65,7 @@ public class UsbDetailsFunctionsControllerTest { private PreferenceCategory mPreferenceCategory; private PreferenceManager mPreferenceManager; private PreferenceScreen mScreen; - private RadioButtonPreference mRadioButtonPreference; + private SelectorWithWidgetPreference mRadioButtonPreference; @Mock private UsbBackend mUsbBackend; @@ -99,7 +99,7 @@ public class UsbDetailsFunctionsControllerTest { mScreen.addPreference(mPreferenceCategory); mDetailsFunctionsController.displayPreference(mScreen); - mRadioButtonPreference = new RadioButtonPreference(mContext); + mRadioButtonPreference = new SelectorWithWidgetPreference(mContext); } @Test @@ -109,10 +109,10 @@ public class UsbDetailsFunctionsControllerTest { mDetailsFunctionsController.displayPreference(mScreen); mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_NONE, POWER_ROLE_SINK, DATA_ROLE_DEVICE); - List prefs = getRadioPreferences(); + List prefs = getRadioPreferences(); Iterator iter = UsbDetailsFunctionsController.FUNCTIONS_MAP.keySet().iterator(); - for (RadioButtonPreference pref : prefs) { + for (SelectorWithWidgetPreference pref : prefs) { assertThat(pref.getKey()).isEqualTo(UsbBackend.usbFunctionsToString(iter.next())); } } @@ -135,7 +135,7 @@ public class UsbDetailsFunctionsControllerTest { mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_NONE, POWER_ROLE_SINK, DATA_ROLE_DEVICE); - List prefs = getRadioPreferences(); + List prefs = getRadioPreferences(); assertThat(prefs.size()).isEqualTo(1); assertThat(prefs.get(0).getKey()) .isEqualTo(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MIDI)); @@ -147,7 +147,7 @@ public class UsbDetailsFunctionsControllerTest { mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_MTP, POWER_ROLE_SINK, DATA_ROLE_DEVICE); - List prefs = getRadioPreferences(); + List prefs = getRadioPreferences(); assertThat(prefs.get(0).getKey()) .isEqualTo(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP)); @@ -160,7 +160,7 @@ public class UsbDetailsFunctionsControllerTest { mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_ACCESSORY, POWER_ROLE_SINK, DATA_ROLE_DEVICE); - List prefs = getRadioPreferences(); + List prefs = getRadioPreferences(); assertThat(prefs.get(0).getKey()) .isEqualTo(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP)); @@ -173,7 +173,7 @@ public class UsbDetailsFunctionsControllerTest { mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_NCM, POWER_ROLE_SINK, DATA_ROLE_DEVICE); - List prefs = getRadioPreferences(); + List prefs = getRadioPreferences(); assertThat(prefs.get(1).getKey()) .isEqualTo(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_RNDIS)); @@ -187,7 +187,7 @@ public class UsbDetailsFunctionsControllerTest { mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_NONE, POWER_ROLE_SINK, DATA_ROLE_DEVICE); when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_NONE); - List prefs = getRadioPreferences(); + List prefs = getRadioPreferences(); prefs.get(0).performClick(); assertThat(prefs.get(0).getKey()) @@ -205,7 +205,7 @@ public class UsbDetailsFunctionsControllerTest { mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_PTP, POWER_ROLE_SINK, DATA_ROLE_DEVICE); when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_PTP); - List prefs = getRadioPreferences(); + List prefs = getRadioPreferences(); prefs.get(0).performClick(); assertThat(prefs.get(0).getKey()) @@ -226,7 +226,7 @@ public class UsbDetailsFunctionsControllerTest { mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_MTP, POWER_ROLE_SINK, DATA_ROLE_DEVICE); when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_MTP); - List prefs = getRadioPreferences(); + List prefs = getRadioPreferences(); prefs.get(4).performClick(); assertThat(prefs.get(4).getKey()) @@ -244,10 +244,10 @@ public class UsbDetailsFunctionsControllerTest { assertThat(mDetailsFunctionsController.isAvailable()).isFalse(); } - private List getRadioPreferences() { - ArrayList result = new ArrayList<>(); + private List getRadioPreferences() { + ArrayList result = new ArrayList<>(); for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i++) { - result.add((RadioButtonPreference) mPreferenceCategory.getPreference(i)); + result.add((SelectorWithWidgetPreference) mPreferenceCategory.getPreference(i)); } return result; } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index b50e0832ec0..a66cf4e0560 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -62,7 +62,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.LayoutPreference; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.After; import org.junit.Before; @@ -127,9 +127,9 @@ public class AdvancedPowerUsageDetailTest { private Preference mForegroundPreference; private Preference mBackgroundPreference; private FooterPreference mFooterPreference; - private RadioButtonPreference mRestrictedPreference; - private RadioButtonPreference mOptimizePreference; - private RadioButtonPreference mUnrestrictedPreference; + private SelectorWithWidgetPreference mRestrictedPreference; + private SelectorWithWidgetPreference mOptimizePreference; + private SelectorWithWidgetPreference mUnrestrictedPreference; private AdvancedPowerUsageDetail mFragment; private SettingsActivity mTestActivity; private FakeFeatureFactory mFeatureFactory; @@ -208,9 +208,9 @@ public class AdvancedPowerUsageDetailTest { mForegroundPreference = new Preference(mContext); mBackgroundPreference = new Preference(mContext); mFooterPreference = new FooterPreference(mContext); - mRestrictedPreference = new RadioButtonPreference(mContext); - mOptimizePreference = new RadioButtonPreference(mContext); - mUnrestrictedPreference = new RadioButtonPreference(mContext); + mRestrictedPreference = new SelectorWithWidgetPreference(mContext); + mOptimizePreference = new SelectorWithWidgetPreference(mContext); + mUnrestrictedPreference = new SelectorWithWidgetPreference(mContext); mFragment.mForegroundPreference = mForegroundPreference; mFragment.mBackgroundPreference = mBackgroundPreference; mFragment.mFooterPreference = mFooterPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java index 874618db00b..7b8f661d0e0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -38,7 +38,7 @@ public class OptimizedPreferenceControllerTest { private static final String PACKAGE_NAME = "com.android.app"; private OptimizedPreferenceController mController; - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; @Mock BatteryOptimizeUtils mockBatteryOptimizeUtils; @@ -48,7 +48,7 @@ public class OptimizedPreferenceControllerTest { mController = new OptimizedPreferenceController( RuntimeEnvironment.application, UID, PACKAGE_NAME); - mPreference = new RadioButtonPreference(RuntimeEnvironment.application); + mPreference = new SelectorWithWidgetPreference(RuntimeEnvironment.application); mController.mBatteryOptimizeUtils = mockBatteryOptimizeUtils; } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedPreferenceControllerTest.java index 2e17404f675..7cca18eba9a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -38,7 +38,7 @@ public class RestrictedPreferenceControllerTest { private static final String PACKAGE_NAME = "com.android.app"; private RestrictedPreferenceController mController; - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; @Mock BatteryOptimizeUtils mockBatteryOptimizeUtils; @@ -48,7 +48,7 @@ public class RestrictedPreferenceControllerTest { mController = new RestrictedPreferenceController( RuntimeEnvironment.application, UID, PACKAGE_NAME); - mPreference = new RadioButtonPreference(RuntimeEnvironment.application); + mPreference = new SelectorWithWidgetPreference(RuntimeEnvironment.application); mController.mBatteryOptimizeUtils = mockBatteryOptimizeUtils; } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java index 63cf760a2f6..0bb8932d88a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -39,7 +39,7 @@ public class UnrestrictedPreferenceControllerTest { private static final String PACKAGE_NAME = "com.android.app"; private UnrestrictedPreferenceController mController; - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; @Mock BatteryOptimizeUtils mockBatteryOptimizeUtils; @@ -49,7 +49,7 @@ public class UnrestrictedPreferenceControllerTest { mController = new UnrestrictedPreferenceController( RuntimeEnvironment.application, UID, PACKAGE_NAME); - mPreference = new RadioButtonPreference(RuntimeEnvironment.application); + mPreference = new SelectorWithWidgetPreference(RuntimeEnvironment.application); mController.mBatteryOptimizeUtils = mockBatteryOptimizeUtils; } diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedActionPullDownPrefControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedActionPullDownPrefControllerTest.java index 36938c2ee9d..e6b03432927 100644 --- a/tests/robotests/src/com/android/settings/gestures/OneHandedActionPullDownPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/OneHandedActionPullDownPrefControllerTest.java @@ -23,7 +23,7 @@ import android.os.SystemProperties; import android.os.UserHandle; import com.android.settings.core.BasePreferenceController; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -39,14 +39,14 @@ public class OneHandedActionPullDownPrefControllerTest { private Context mContext; private OneHandedSettingsUtils mUtils; private OneHandedActionPullDownPrefController mController; - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; @Before public void setUp() { mContext = RuntimeEnvironment.application; mUtils = new OneHandedSettingsUtils(mContext); mController = new OneHandedActionPullDownPrefController(mContext, KEY); - mPreference = new RadioButtonPreference(mContext); + mPreference = new SelectorWithWidgetPreference(mContext); OneHandedSettingsUtils.setUserId(UserHandle.myUserId()); } diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefControllerTest.java index a7afccd2fe5..da271917d5e 100644 --- a/tests/robotests/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefControllerTest.java @@ -23,7 +23,7 @@ import android.os.SystemProperties; import android.os.UserHandle; import com.android.settings.core.BasePreferenceController; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -39,14 +39,14 @@ public class OneHandedActionShowNotificationPrefControllerTest { private Context mContext; private OneHandedSettingsUtils mUtils; private OneHandedActionShowNotificationPrefController mController; - private RadioButtonPreference mPreference; + private SelectorWithWidgetPreference mPreference; @Before public void setUp() { mContext = RuntimeEnvironment.application; mUtils = new OneHandedSettingsUtils(mContext); mController = new OneHandedActionShowNotificationPrefController(mContext, KEY); - mPreference = new RadioButtonPreference(mContext); + mPreference = new SelectorWithWidgetPreference(mContext); OneHandedSettingsUtils.setUserId(UserHandle.myUserId()); } diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java index 24a849073a1..f537ccb729e 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -58,8 +58,8 @@ public class PreventRingingGesturePreferenceControllerTest { .thenReturn(true); mController = new PreventRingingGesturePreferenceController(mContext, null); mController.mPreferenceCategory = new PreferenceCategory(mContext); - mController.mVibratePref = new RadioButtonPreference(mContext); - mController.mMutePref = new RadioButtonPreference(mContext); + mController.mVibratePref = new SelectorWithWidgetPreference(mContext); + mController.mMutePref = new SelectorWithWidgetPreference(mContext); } @Test @@ -122,7 +122,7 @@ public class PreventRingingGesturePreferenceControllerTest { @Test public void testRadioButtonClicked_mute() { - RadioButtonPreference rbPref = new RadioButtonPreference(mContext); + SelectorWithWidgetPreference rbPref = new SelectorWithWidgetPreference(mContext); rbPref.setKey(PreventRingingGesturePreferenceController.KEY_MUTE); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, @@ -136,7 +136,7 @@ public class PreventRingingGesturePreferenceControllerTest { @Test public void testRadioButtonClicked_vibrate() { - RadioButtonPreference rbPref = new RadioButtonPreference(mContext); + SelectorWithWidgetPreference rbPref = new SelectorWithWidgetPreference(mContext); rbPref.setKey(PreventRingingGesturePreferenceController.KEY_VIBRATE); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE, diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java index a8a8a7a3ed3..6bf0538c33b 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java @@ -44,7 +44,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.notification.NotificationBackend; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -74,7 +74,7 @@ public class ZenModePriorityConversationsPreferenceControllerTest { @Mock private NotificationBackend mNotifBackend; - private List mRadioButtonPreferences; + private List mSelectorWithWidgetPreferences; private ContentResolver mContentResolver; private Context mContext; @Before @@ -102,7 +102,7 @@ public class ZenModePriorityConversationsPreferenceControllerTest { @Test public void clickAllConversations() { - RadioButtonPreference allConversationsRb = getButton(KEY_ALL); + SelectorWithWidgetPreference allConversationsRb = getButton(KEY_ALL); allConversationsRb.onClick(); verify(mZenBackend).saveConversationSenders(CONVERSATION_SENDERS_ANYONE); @@ -110,7 +110,7 @@ public class ZenModePriorityConversationsPreferenceControllerTest { @Test public void clickImportantConversations() { - RadioButtonPreference importantConversationsRb = getButton(KEY_IMPORTANT); + SelectorWithWidgetPreference importantConversationsRb = getButton(KEY_IMPORTANT); importantConversationsRb.onClick(); verify(mZenBackend).saveConversationSenders(CONVERSATION_SENDERS_IMPORTANT); @@ -118,7 +118,7 @@ public class ZenModePriorityConversationsPreferenceControllerTest { @Test public void clickNoConversations() { - RadioButtonPreference noConversationsRb = getButton(KEY_NONE); + SelectorWithWidgetPreference noConversationsRb = getButton(KEY_NONE); noConversationsRb.onClick(); verify(mZenBackend) @@ -126,20 +126,20 @@ public class ZenModePriorityConversationsPreferenceControllerTest { } private void captureRadioButtons() { - ArgumentCaptor rbCaptor = - ArgumentCaptor.forClass(RadioButtonPreference.class); + ArgumentCaptor rbCaptor = + ArgumentCaptor.forClass(SelectorWithWidgetPreference.class); mController.displayPreference(mPreferenceScreen); // verifies 3 buttons were added verify(mMockPrefCategory, times(3)).addPreference(rbCaptor.capture()); - mRadioButtonPreferences = rbCaptor.getAllValues(); - assertThat(mRadioButtonPreferences.size()).isEqualTo(3); + mSelectorWithWidgetPreferences = rbCaptor.getAllValues(); + assertThat(mSelectorWithWidgetPreferences.size()).isEqualTo(3); reset(mMockPrefCategory); } - private RadioButtonPreference getButton(String key) { - for (RadioButtonPreference pref : mRadioButtonPreferences) { + private SelectorWithWidgetPreference getButton(String key) { + for (SelectorWithWidgetPreference pref : mSelectorWithWidgetPreferences) { if (key.equals(pref.getKey())) { return pref; } diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java index 7dde1cd042e..23dc71a44c9 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java @@ -46,7 +46,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.notification.NotificationBackend; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -76,7 +76,7 @@ public class ZenModePrioritySendersPreferenceControllerTest { @Mock private NotificationBackend mNotifBackend; - private List mRadioButtonPreferences; + private List mSelectorWithWidgetPreferences; private ContentResolver mContentResolver; private Context mContext; @Before @@ -108,7 +108,7 @@ public class ZenModePrioritySendersPreferenceControllerTest { when(mZenBackend.getPriorityMessageSenders()).thenReturn(PRIORITY_SENDERS_STARRED); // WHEN user clicks the any senders option - RadioButtonPreference allSendersRb = getButton(KEY_ANY); + SelectorWithWidgetPreference allSendersRb = getButton(KEY_ANY); allSendersRb.onClick(); // THEN any senders gets saved as priority senders for messages @@ -121,7 +121,7 @@ public class ZenModePrioritySendersPreferenceControllerTest { when(mZenBackend.getPriorityMessageSenders()).thenReturn(PRIORITY_SENDERS_ANY); // WHEN user clicks the starred contacts option - RadioButtonPreference starredRb = getButton(KEY_STARRED); + SelectorWithWidgetPreference starredRb = getButton(KEY_STARRED); starredRb.onClick(); // THEN starred contacts gets saved as priority senders for messages @@ -134,7 +134,7 @@ public class ZenModePrioritySendersPreferenceControllerTest { when(mZenBackend.getPriorityMessageSenders()).thenReturn(PRIORITY_SENDERS_ANY); // WHEN user clicks the contacts only option - RadioButtonPreference contactsRb = getButton(KEY_CONTACTS); + SelectorWithWidgetPreference contactsRb = getButton(KEY_CONTACTS); contactsRb.onClick(); // THEN contacts gets saved as priority senders for messages @@ -147,7 +147,7 @@ public class ZenModePrioritySendersPreferenceControllerTest { when(mZenBackend.getPriorityMessageSenders()).thenReturn(PRIORITY_SENDERS_ANY); // WHEN user clicks the no senders option - RadioButtonPreference noSenders = getButton(KEY_NONE); + SelectorWithWidgetPreference noSenders = getButton(KEY_NONE); noSenders.onClick(); // THEN no senders gets saved as priority senders for messages @@ -160,7 +160,7 @@ public class ZenModePrioritySendersPreferenceControllerTest { when(mZenBackend.getPriorityMessageSenders()).thenReturn(PRIORITY_SENDERS_ANY); // WHEN user clicks the any senders option multiple times again - RadioButtonPreference anySenders = getButton(KEY_ANY); + SelectorWithWidgetPreference anySenders = getButton(KEY_ANY); anySenders.onClick(); anySenders.onClick(); anySenders.onClick(); @@ -170,20 +170,20 @@ public class ZenModePrioritySendersPreferenceControllerTest { } private void captureRadioButtons() { - ArgumentCaptor rbCaptor = - ArgumentCaptor.forClass(RadioButtonPreference.class); + ArgumentCaptor rbCaptor = + ArgumentCaptor.forClass(SelectorWithWidgetPreference.class); mMessagesController.displayPreference(mPreferenceScreen); // verifies 4 buttons were added verify(mMockPrefCategory, times(4)).addPreference(rbCaptor.capture()); - mRadioButtonPreferences = rbCaptor.getAllValues(); - assertThat(mRadioButtonPreferences.size()).isEqualTo(4); + mSelectorWithWidgetPreferences = rbCaptor.getAllValues(); + assertThat(mSelectorWithWidgetPreferences.size()).isEqualTo(4); reset(mMockPrefCategory); } - private RadioButtonPreference getButton(String key) { - for (RadioButtonPreference pref : mRadioButtonPreferences) { + private SelectorWithWidgetPreference getButton(String key) { + for (SelectorWithWidgetPreference pref : mSelectorWithWidgetPreferences) { if (key.equals(pref.getKey())) { return pref; } diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java index 45a40d3ee0a..97fc3e0392a 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java @@ -42,7 +42,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -61,7 +61,7 @@ public class ZenModeVisEffectsAllPreferenceControllerTest { @Mock private ZenModeBackend mBackend; @Mock - private RadioButtonPreference mPref; + private SelectorWithWidgetPreference mPref; private Context mContext; private FakeFeatureFactory mFeatureFactory; @Mock diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java index 88c2c501380..7158fc11b8e 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java @@ -40,7 +40,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -59,7 +59,7 @@ public class ZenModeVisEffectsCustomPreferenceControllerTest { @Mock private ZenModeBackend mBackend; @Mock - private RadioButtonPreference mPref; + private SelectorWithWidgetPreference mPref; private Context mContext; @Mock private PreferenceScreen mScreen; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java index 79c6cb8ec03..91d7c007d3c 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java @@ -42,7 +42,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -61,7 +61,7 @@ public class ZenModeVisEffectsNonePreferenceControllerTest { @Mock private ZenModeBackend mBackend; @Mock - private RadioButtonPreference mMockPref; + private SelectorWithWidgetPreference mMockPref; private Context mContext; private FakeFeatureFactory mFeatureFactory; @Mock diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java index f149541f885..55b9ac2b81e 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.service.notification.ZenPolicy; import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ public class ZenRuleCustomPolicyPreferenceControllerTest extends @Mock private NotificationManager mNotificationManager; @Mock - private RadioButtonPreference mMockPref; + private SelectorWithWidgetPreference mMockPref; @Mock private PreferenceScreen mScreen; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java index c0258e4f9aa..af89854d601 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.service.notification.ZenPolicy; import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ public class ZenRuleDefaultPolicyPreferenceControllerTest extends @Mock private NotificationManager mNotificationManager; @Mock - private RadioButtonPreference mMockPref; + private SelectorWithWidgetPreference mMockPref; @Mock private PreferenceScreen mScreen; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java index e3fef1929fa..10eae066f2d 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -49,7 +49,7 @@ public class ZenRulePreferenceControllerTest { @Mock private NotificationManager mNotificationManager; @Mock - private RadioButtonPreference mMockPref; + private SelectorWithWidgetPreference mMockPref; @Mock private PreferenceScreen mScreen; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java index edbcd06377b..a78426a9950 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.service.notification.ZenPolicy; import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ public class ZenRuleVisEffectsAllPreferenceControllerTest extends @Mock private NotificationManager mNotificationManager; @Mock - private RadioButtonPreference mMockPref; + private SelectorWithWidgetPreference mMockPref; @Mock private PreferenceScreen mScreen; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java index ece5d5fc3eb..8e29df17eb1 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.service.notification.ZenPolicy; import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ public class ZenRuleVisEffectsCustomPreferenceControllerTest extends @Mock private NotificationManager mNotificationManager; @Mock - private RadioButtonPreference mMockPref; + private SelectorWithWidgetPreference mMockPref; @Mock private PreferenceScreen mScreen; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java index 2daf4fba1e1..d8f8162c154 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.service.notification.ZenPolicy; import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ public class ZenRuleVisEffectsNonePreferenceControllerTest extends @Mock private NotificationManager mNotificationManager; @Mock - private RadioButtonPreference mMockPref; + private SelectorWithWidgetPreference mMockPref; @Mock private PreferenceScreen mScreen; diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java index 87495140343..9d7fbaec4fb 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -43,7 +43,7 @@ import androidx.fragment.app.FragmentActivity; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.After; import org.junit.Before; @@ -147,7 +147,7 @@ public class WebViewAppPickerTest { mContext.getPackageManager(), createApplicationInfo(PACKAGE_NAME), "disabled"); - RadioButtonPreference preference = mock(RadioButtonPreference.class); + SelectorWithWidgetPreference preference = mock(SelectorWithWidgetPreference.class); mPicker.bindPreference(preference, PACKAGE_NAME, webviewAppInfo, null); mPicker.bindPreferenceExtra(preference, PACKAGE_NAME, webviewAppInfo, null, null); verify(preference, times(1)).setEnabled(eq(false)); @@ -161,7 +161,7 @@ public class WebViewAppPickerTest { mContext.getPackageManager(), createApplicationInfo(PACKAGE_NAME), disabledReason); - RadioButtonPreference preference = mock(RadioButtonPreference.class); + SelectorWithWidgetPreference preference = mock(SelectorWithWidgetPreference.class); mPicker.bindPreference(preference, PACKAGE_NAME, webviewAppInfo, null); mPicker.bindPreferenceExtra(preference, PACKAGE_NAME, webviewAppInfo, null, null); verify(preference, times(1)).setEnabled(eq(true)); @@ -175,7 +175,7 @@ public class WebViewAppPickerTest { mContext.getPackageManager(), createApplicationInfo(PACKAGE_NAME), disabledReason); - RadioButtonPreference preference = mock(RadioButtonPreference.class); + SelectorWithWidgetPreference preference = mock(SelectorWithWidgetPreference.class); mPicker.bindPreference(preference, PACKAGE_NAME, webviewAppInfo, null); mPicker.bindPreferenceExtra(preference, PACKAGE_NAME, webviewAppInfo, null, null); verify(preference, times(1)).setSummary(eq(disabledReason)); @@ -189,7 +189,7 @@ public class WebViewAppPickerTest { mContext.getPackageManager(), createApplicationInfo(PACKAGE_NAME), null); - RadioButtonPreference preference = mock(RadioButtonPreference.class); + SelectorWithWidgetPreference preference = mock(SelectorWithWidgetPreference.class); mPicker.bindPreference(preference, PACKAGE_NAME, webviewAppInfo, null); mPicker.bindPreferenceExtra(preference, PACKAGE_NAME, webviewAppInfo, null, null); verify(preference, never()).setSummary(any()); @@ -314,7 +314,8 @@ public class WebViewAppPickerTest { mContext.getPackageManager(), createApplicationInfo(PACKAGE_NAME), "" /* disabledReason */); - final RadioButtonPreference mockPreference = mock(RadioButtonPreference.class); + final SelectorWithWidgetPreference mockPreference = + mock(SelectorWithWidgetPreference.class); mPicker.bindPreference(mockPreference, PACKAGE_NAME, webviewAppInfo, null); mPicker.bindPreferenceExtra( mockPreference, PACKAGE_NAME, webviewAppInfo, null, null); @@ -339,7 +340,7 @@ public class WebViewAppPickerTest { .thenReturn(Collections.singletonList(createApplicationInfo(PACKAGE_NAME))); when(mWvusWrapper.setWebViewProvider(eq(PACKAGE_NAME))).thenReturn(true); - RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class); + SelectorWithWidgetPreference defaultPackagePref = mock(SelectorWithWidgetPreference.class); when(defaultPackagePref.getKey()).thenReturn(PACKAGE_NAME); mPicker.onRadioButtonClicked(defaultPackagePref); @@ -353,7 +354,7 @@ public class WebViewAppPickerTest { .thenReturn(Collections.singletonList(createApplicationInfo(PACKAGE_NAME))); when(mWvusWrapper.setWebViewProvider(eq(PACKAGE_NAME))).thenReturn(false); - RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class); + SelectorWithWidgetPreference defaultPackagePref = mock(SelectorWithWidgetPreference.class); when(defaultPackagePref.getKey()).thenReturn(PACKAGE_NAME); mPicker.onRadioButtonClicked(defaultPackagePref); diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index 4b551bda93c..9797f557505 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -32,7 +32,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.applications.DefaultAppInfo; -import com.android.settingslib.widget.RadioButtonPreference; +import com.android.settingslib.widget.SelectorWithWidgetPreference; import org.junit.Before; import org.junit.Test; @@ -80,8 +80,8 @@ public class RadioButtonPickerFragmentTest { @Test public void displaySingleOption_shouldSelectRadioButton() { - final RadioButtonPreference pref = - new RadioButtonPreference(RuntimeEnvironment.application); + final SelectorWithWidgetPreference pref = + new SelectorWithWidgetPreference(RuntimeEnvironment.application); when(mScreen.getPreferenceCount()).thenReturn(1); when(mScreen.getPreference(0)).thenReturn(pref); @@ -92,8 +92,8 @@ public class RadioButtonPickerFragmentTest { @Test public void clickPreference_shouldConfirm() { - final RadioButtonPreference pref = - new RadioButtonPreference(RuntimeEnvironment.application); + final SelectorWithWidgetPreference pref = + new SelectorWithWidgetPreference(RuntimeEnvironment.application); pref.setKey("TEST"); mFragment.onRadioButtonClicked(pref);