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

Merge "Rename RadioButtonPreference -> SelectorWithWidgetPreference."

Browse Source
This commit is contained in:
Julia Reynolds
2021-08-05 20:34:13 +00:00
committed by Android (Google) Code Review
parent e3e33471a9 e9f13fbd5e
commit 17dda0faec
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);
}