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

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;