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

24
tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java
View File

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

30
tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
View File

@@ -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<RadioButtonPreference> prefs = getRadioPreferences();
List<SelectorWithWidgetPreference> prefs = getRadioPreferences();
Iterator<Long> 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<RadioButtonPreference> prefs = getRadioPreferences();
List<SelectorWithWidgetPreference> 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<RadioButtonPreference> prefs = getRadioPreferences();
List<SelectorWithWidgetPreference> 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<RadioButtonPreference> prefs = getRadioPreferences();
List<SelectorWithWidgetPreference> 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<RadioButtonPreference> prefs = getRadioPreferences();
List<SelectorWithWidgetPreference> 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<RadioButtonPreference> prefs = getRadioPreferences();
List<SelectorWithWidgetPreference> 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<RadioButtonPreference> prefs = getRadioPreferences();
List<SelectorWithWidgetPreference> 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<RadioButtonPreference> prefs = getRadioPreferences();
List<SelectorWithWidgetPreference> prefs = getRadioPreferences();
prefs.get(4).performClick();
assertThat(prefs.get(4).getKey())
@@ -244,10 +244,10 @@ public class UsbDetailsFunctionsControllerTest {
assertThat(mDetailsFunctionsController.isAvailable()).isFalse();
}
private List<RadioButtonPreference> getRadioPreferences() {
ArrayList<RadioButtonPreference> result = new ArrayList<>();
private List<SelectorWithWidgetPreference> getRadioPreferences() {
ArrayList<SelectorWithWidgetPreference> 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;
}