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

Rename RadioButtonPreference -> SelectorWithWidgetPreference.

Browse Source 
This change is to reduce ambiguity as we're adding the option to style the preference like a checkbox as well.

Bug: 190180868
Test: SelectorWithWidgetPreferenceTest, RunSettingsLibRoboTests
Change-Id: Ie414347bf67ed394ef495604890c5851fc42dbc7
This commit is contained in:
Yuri Lin
2021-07-20 11:42:39 -04:00
parent a113fdb727
commit e9f13fbd5e
65 changed files with 311 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
View File

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

17
src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
View File

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

18
src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
View File

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