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
tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceControllerTest.java
View File

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

12
tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java
View File

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

6
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
View File

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

6
tests/robotests/src/com/android/settings/bugreporthandler/BugReportHandlerPickerTest.java
View File

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

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

14
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
View File

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

6
tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
View File

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

6
tests/robotests/src/com/android/settings/fuelgauge/RestrictedPreferenceControllerTest.java
View File

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

6
tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
View File

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

6
tests/robotests/src/com/android/settings/gestures/OneHandedActionPullDownPrefControllerTest.java
View File

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

6
tests/robotests/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefControllerTest.java
View File

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

10
tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java
View File

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

22
tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java
View File

@@ -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<RadioButtonPreference> mRadioButtonPreferences;
private List<SelectorWithWidgetPreference> 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<RadioButtonPreference> rbCaptor =
ArgumentCaptor.forClass(RadioButtonPreference.class);
ArgumentCaptor<SelectorWithWidgetPreference> 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;
}

26
tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java
View File

@@ -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<RadioButtonPreference> mRadioButtonPreferences;
private List<SelectorWithWidgetPreference> 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<RadioButtonPreference> rbCaptor =
ArgumentCaptor.forClass(RadioButtonPreference.class);
ArgumentCaptor<SelectorWithWidgetPreference> 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;
}

4
tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
View File

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

17
tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
View File

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

10
tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
View File

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