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

[ToA] Use radio button style for single selection

Browse Source 
1. Change TickButtonPreference to SelectorWithWidgetPreference
2. Modify tests

Bug: 375979373
Flag: EXEMPT bugfix
Test: atest TermsOfAddressFeminineControllerTest, TermsOfAddressMasculineControllerTest, TermsOfAddressNeutralControllerTest, TermsOfAddressNotSpecifiedControllerTest
Change-Id: I29c01fb3d2fa9545bdd817f50d9c48b3610f9785
This commit is contained in:
danielwbhuang
2024-10-28 20:38:18 +08:00
committed by Daniel Huang
parent cf7e295b4a
commit 2d2f523abe
6 changed files with 54 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/terms_of_address.xml
View File

@@ -24,22 +24,22 @@
android:title="@string/terms_of_address_intro_title" android:title="@string/terms_of_address_intro_title"
android:persistent="false"/> android:persistent="false"/>
<com.android.settings.widget.TickButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="key_terms_of_address_not_specified" android:key="key_terms_of_address_not_specified"
android:title="@string/terms_of_address_not_specified" android:title="@string/terms_of_address_not_specified"
settings:controller="com.android.settings.localepicker.TermsOfAddressNotSpecifiedController"/> settings:controller="com.android.settings.localepicker.TermsOfAddressNotSpecifiedController"/>
<com.android.settings.widget.TickButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="key_terms_of_address_feminine" android:key="key_terms_of_address_feminine"
android:title="@string/terms_of_address_feminine" android:title="@string/terms_of_address_feminine"
settings:controller="com.android.settings.localepicker.TermsOfAddressFeminineController"/> settings:controller="com.android.settings.localepicker.TermsOfAddressFeminineController"/>
<com.android.settings.widget.TickButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="key_terms_of_address_masculine" android:key="key_terms_of_address_masculine"
android:title="@string/terms_of_address_masculine" android:title="@string/terms_of_address_masculine"
settings:controller="com.android.settings.localepicker.TermsOfAddressMasculineController"/> settings:controller="com.android.settings.localepicker.TermsOfAddressMasculineController"/>
<com.android.settings.widget.TickButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="key_terms_of_address_neutral" android:key="key_terms_of_address_neutral"
android:title="@string/terms_of_address_neutral" android:title="@string/terms_of_address_neutral"
settings:controller="com.android.settings.localepicker.TermsOfAddressNeutralController"/> settings:controller="com.android.settings.localepicker.TermsOfAddressNeutralController"/>

29
src/com/android/settings/localepicker/TermsOfAddressBaseController.java
View File

@@ -23,8 +23,8 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.TickButtonPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@@ -32,9 +32,9 @@ import java.util.concurrent.Executors;
public abstract class TermsOfAddressBaseController extends BasePreferenceController { public abstract class TermsOfAddressBaseController extends BasePreferenceController {
private static final Executor sExecutor = Executors.newSingleThreadExecutor(); private static final Executor sExecutor = Executors.newSingleThreadExecutor();
private PreferenceScreen mPreferenceScreen;
private MetricsFeatureProvider mMetricsFeatureProvider; private MetricsFeatureProvider mMetricsFeatureProvider;
private TickButtonPreference mPreference; private SelectorWithWidgetPreference mPreference;
private TermsOfAddressHelper mTermsOfAddressHelper; private TermsOfAddressHelper mTermsOfAddressHelper;
public TermsOfAddressBaseController(Context context, String preferenceKey) { public TermsOfAddressBaseController(Context context, String preferenceKey) {
@@ -49,34 +49,17 @@ public abstract class TermsOfAddressBaseController extends BasePreferenceControl
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreferenceScreen = screen;
mPreference = screen.findPreference(getPreferenceKey()); mPreference = screen.findPreference(getPreferenceKey());
mPreference.setOnPreferenceClickListener(clickedPref -> { mPreference.setChecked(
mTermsOfAddressHelper.getSystemGrammaticalGender() == getGrammaticalGenderType());
mPreference.setOnClickListener(v -> {
sExecutor.execute( sExecutor.execute(
() -> { () -> {
mTermsOfAddressHelper.setSystemGrammaticalGender( mTermsOfAddressHelper.setSystemGrammaticalGender(
getGrammaticalGenderType()); getGrammaticalGenderType());
}); });
setSelected(mPreference);
mMetricsFeatureProvider.action(mContext, getMetricsActionKey()); mMetricsFeatureProvider.action(mContext, getMetricsActionKey());
return true;
}); });
updatePreferences();
}
private void setSelected(TickButtonPreference preference) {
for (int i = 1; i < mPreferenceScreen.getPreferenceCount(); i++) {
TickButtonPreference pref = (TickButtonPreference) mPreferenceScreen.getPreference(i);
pref.setSelected(pref.getKey().equals(preference.getKey()));
}
}
private void updatePreferences() {
if (mPreference == null) {
return;
}
mPreference.setSelected(
mTermsOfAddressHelper.getSystemGrammaticalGender() == getGrammaticalGenderType());
} }
@Override @Override

22
tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java
View File

@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.widget.TickButtonPreference; import com.android.settingslib.widget.SelectorWithWidgetPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
@@ -53,10 +53,10 @@ public class TermsOfAddressFeminineControllerTest {
private PreferenceCategory mPreferenceCategory; private PreferenceCategory mPreferenceCategory;
private PreferenceScreen mPreferenceScreen; private PreferenceScreen mPreferenceScreen;
private TermsOfAddressFeminineController mController; private TermsOfAddressFeminineController mController;
private TickButtonPreference mFemininePreference; private SelectorWithWidgetPreference mFemininePreference;
private TickButtonPreference mMasculinePreference; private SelectorWithWidgetPreference mMasculinePreference;
private TickButtonPreference mNotSpecifiedPreference; private SelectorWithWidgetPreference mNotSpecifiedPreference;
private TickButtonPreference mNeutralPreference; private SelectorWithWidgetPreference mNeutralPreference;
private GrammaticalInflectionManager mGrammaticalInflectionManager; private GrammaticalInflectionManager mGrammaticalInflectionManager;
@Before @Before
@@ -74,13 +74,13 @@ public class TermsOfAddressFeminineControllerTest {
mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
mPreferenceCategory = new PreferenceCategory(mContext); mPreferenceCategory = new PreferenceCategory(mContext);
mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS); mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS);
mNotSpecifiedPreference = new TickButtonPreference(mContext); mNotSpecifiedPreference = new SelectorWithWidgetPreference(mContext);
mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED); mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED);
mFemininePreference = new TickButtonPreference(mContext); mFemininePreference = new SelectorWithWidgetPreference(mContext);
mFemininePreference.setKey(KEY_FEMININE); mFemininePreference.setKey(KEY_FEMININE);
mMasculinePreference = new TickButtonPreference(mContext); mMasculinePreference = new SelectorWithWidgetPreference(mContext);
mMasculinePreference.setKey(KEY_MASCULINE); mMasculinePreference.setKey(KEY_MASCULINE);
mNeutralPreference = new TickButtonPreference(mContext); mNeutralPreference = new SelectorWithWidgetPreference(mContext);
mNeutralPreference.setKey(KEY_NEUTRAL); mNeutralPreference.setKey(KEY_NEUTRAL);
mPreferenceScreen.addPreference(mPreferenceCategory); mPreferenceScreen.addPreference(mPreferenceCategory);
mPreferenceScreen.addPreference(mNotSpecifiedPreference); mPreferenceScreen.addPreference(mNotSpecifiedPreference);
@@ -95,8 +95,8 @@ public class TermsOfAddressFeminineControllerTest {
@Test @Test
@Ignore("b/339543490") @Ignore("b/339543490")
public void displayPreference_setGrammaticalGenderIsFeminine_FeminineIsSelected() { public void displayPreference_setGrammaticalGenderIsFeminine_FeminineIsSelected() {
TickButtonPreference selectedPreference = SelectorWithWidgetPreference selectedPreference =
(TickButtonPreference) mPreferenceScreen.getPreference(2); (SelectorWithWidgetPreference) mPreferenceScreen.getPreference(2);
selectedPreference.performClick(); selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_FEMININE); assertThat(selectedPreference.getKey()).isEqualTo(KEY_FEMININE);

22
tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java
View File

@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.widget.TickButtonPreference; import com.android.settingslib.widget.SelectorWithWidgetPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
@@ -53,10 +53,10 @@ public class TermsOfAddressMasculineControllerTest {
private PreferenceCategory mPreferenceCategory; private PreferenceCategory mPreferenceCategory;
private PreferenceScreen mPreferenceScreen; private PreferenceScreen mPreferenceScreen;
private TermsOfAddressMasculineController mController; private TermsOfAddressMasculineController mController;
private TickButtonPreference mFemininePreference; private SelectorWithWidgetPreference mFemininePreference;
private TickButtonPreference mMasculinePreference; private SelectorWithWidgetPreference mMasculinePreference;
private TickButtonPreference mNotSpecifiedPreference; private SelectorWithWidgetPreference mNotSpecifiedPreference;
private TickButtonPreference mNeutralPreference; private SelectorWithWidgetPreference mNeutralPreference;
private GrammaticalInflectionManager mGrammaticalInflectionManager; private GrammaticalInflectionManager mGrammaticalInflectionManager;
@Before @Before
@@ -74,13 +74,13 @@ public class TermsOfAddressMasculineControllerTest {
mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
mPreferenceCategory = new PreferenceCategory(mContext); mPreferenceCategory = new PreferenceCategory(mContext);
mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS); mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS);
mNotSpecifiedPreference = new TickButtonPreference(mContext); mNotSpecifiedPreference = new SelectorWithWidgetPreference(mContext);
mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED); mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED);
mFemininePreference = new TickButtonPreference(mContext); mFemininePreference = new SelectorWithWidgetPreference(mContext);
mFemininePreference.setKey(KEY_FEMININE); mFemininePreference.setKey(KEY_FEMININE);
mMasculinePreference = new TickButtonPreference(mContext); mMasculinePreference = new SelectorWithWidgetPreference(mContext);
mMasculinePreference.setKey(KEY_MASCULINE); mMasculinePreference.setKey(KEY_MASCULINE);
mNeutralPreference = new TickButtonPreference(mContext); mNeutralPreference = new SelectorWithWidgetPreference(mContext);
mNeutralPreference.setKey(KEY_NEUTRAL); mNeutralPreference.setKey(KEY_NEUTRAL);
mPreferenceScreen.addPreference(mPreferenceCategory); mPreferenceScreen.addPreference(mPreferenceCategory);
mPreferenceScreen.addPreference(mNotSpecifiedPreference); mPreferenceScreen.addPreference(mNotSpecifiedPreference);
@@ -95,8 +95,8 @@ public class TermsOfAddressMasculineControllerTest {
@Test @Test
@Ignore("b/339543490") @Ignore("b/339543490")
public void displayPreference_setGrammaticalGenderIsMasculine_MasculineIsSelected() { public void displayPreference_setGrammaticalGenderIsMasculine_MasculineIsSelected() {
TickButtonPreference selectedPreference = SelectorWithWidgetPreference selectedPreference =
(TickButtonPreference) mPreferenceScreen.getPreference(3); (SelectorWithWidgetPreference) mPreferenceScreen.getPreference(3);
selectedPreference.performClick(); selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_MASCULINE); assertThat(selectedPreference.getKey()).isEqualTo(KEY_MASCULINE);

22
tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java
View File

@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.widget.TickButtonPreference; import com.android.settingslib.widget.SelectorWithWidgetPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
@@ -53,10 +53,10 @@ public class TermsOfAddressNeutralControllerTest {
private PreferenceCategory mPreferenceCategory; private PreferenceCategory mPreferenceCategory;
private PreferenceScreen mPreferenceScreen; private PreferenceScreen mPreferenceScreen;
private TermsOfAddressNeutralController mController; private TermsOfAddressNeutralController mController;
private TickButtonPreference mFemininePreference; private SelectorWithWidgetPreference mFemininePreference;
private TickButtonPreference mMasculinePreference; private SelectorWithWidgetPreference mMasculinePreference;
private TickButtonPreference mNotSpecifiedPreference; private SelectorWithWidgetPreference mNotSpecifiedPreference;
private TickButtonPreference mNeutralPreference; private SelectorWithWidgetPreference mNeutralPreference;
private GrammaticalInflectionManager mGrammaticalInflectionManager; private GrammaticalInflectionManager mGrammaticalInflectionManager;
@Before @Before
@@ -74,13 +74,13 @@ public class TermsOfAddressNeutralControllerTest {
mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
mPreferenceCategory = new PreferenceCategory(mContext); mPreferenceCategory = new PreferenceCategory(mContext);
mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS); mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS);
mNotSpecifiedPreference = new TickButtonPreference(mContext); mNotSpecifiedPreference = new SelectorWithWidgetPreference(mContext);
mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED); mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED);
mFemininePreference = new TickButtonPreference(mContext); mFemininePreference = new SelectorWithWidgetPreference(mContext);
mFemininePreference.setKey(KEY_FEMININE); mFemininePreference.setKey(KEY_FEMININE);
mMasculinePreference = new TickButtonPreference(mContext); mMasculinePreference = new SelectorWithWidgetPreference(mContext);
mMasculinePreference.setKey(KEY_MASCULINE); mMasculinePreference.setKey(KEY_MASCULINE);
mNeutralPreference = new TickButtonPreference(mContext); mNeutralPreference = new SelectorWithWidgetPreference(mContext);
mNeutralPreference.setKey(KEY_NEUTRAL); mNeutralPreference.setKey(KEY_NEUTRAL);
mPreferenceScreen.addPreference(mPreferenceCategory); mPreferenceScreen.addPreference(mPreferenceCategory);
mPreferenceScreen.addPreference(mNotSpecifiedPreference); mPreferenceScreen.addPreference(mNotSpecifiedPreference);
@@ -95,8 +95,8 @@ public class TermsOfAddressNeutralControllerTest {
@Test @Test
@Ignore("b/339543490") @Ignore("b/339543490")
public void displayPreference_setGrammaticalGenderIsNotSpecified_NeutralIsSelected() { public void displayPreference_setGrammaticalGenderIsNotSpecified_NeutralIsSelected() {
TickButtonPreference selectedPreference = SelectorWithWidgetPreference selectedPreference =
(TickButtonPreference) mPreferenceScreen.getPreference(4); (SelectorWithWidgetPreference) mPreferenceScreen.getPreference(4);
selectedPreference.performClick(); selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_NEUTRAL); assertThat(selectedPreference.getKey()).isEqualTo(KEY_NEUTRAL);

22
tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java
View File

@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.widget.TickButtonPreference; import com.android.settingslib.widget.SelectorWithWidgetPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
@@ -53,10 +53,10 @@ public class TermsOfAddressNotSpecifiedControllerTest {
private PreferenceCategory mPreferenceCategory; private PreferenceCategory mPreferenceCategory;
private PreferenceScreen mPreferenceScreen; private PreferenceScreen mPreferenceScreen;
private TermsOfAddressNotSpecifiedController mController; private TermsOfAddressNotSpecifiedController mController;
private TickButtonPreference mFemininePreference; private SelectorWithWidgetPreference mFemininePreference;
private TickButtonPreference mMasculinePreference; private SelectorWithWidgetPreference mMasculinePreference;
private TickButtonPreference mNotSpecifiedPreference; private SelectorWithWidgetPreference mNotSpecifiedPreference;
private TickButtonPreference mNeutralPreference; private SelectorWithWidgetPreference mNeutralPreference;
private GrammaticalInflectionManager mGrammaticalInflectionManager; private GrammaticalInflectionManager mGrammaticalInflectionManager;
@Before @Before
@@ -74,13 +74,13 @@ public class TermsOfAddressNotSpecifiedControllerTest {
mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
mPreferenceCategory = new PreferenceCategory(mContext); mPreferenceCategory = new PreferenceCategory(mContext);
mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS); mPreferenceCategory.setKey(KEY_CATEGORY_TERMS_OF_ADDRESS);
mNotSpecifiedPreference = new TickButtonPreference(mContext); mNotSpecifiedPreference = new SelectorWithWidgetPreference(mContext);
mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED); mNotSpecifiedPreference.setKey(KEY_NOT_SPECIFIED);
mFemininePreference = new TickButtonPreference(mContext); mFemininePreference = new SelectorWithWidgetPreference(mContext);
mFemininePreference.setKey(KEY_FEMININE); mFemininePreference.setKey(KEY_FEMININE);
mMasculinePreference = new TickButtonPreference(mContext); mMasculinePreference = new SelectorWithWidgetPreference(mContext);
mMasculinePreference.setKey(KEY_MASCULINE); mMasculinePreference.setKey(KEY_MASCULINE);
mNeutralPreference = new TickButtonPreference(mContext); mNeutralPreference = new SelectorWithWidgetPreference(mContext);
mNeutralPreference.setKey(KEY_NEUTRAL); mNeutralPreference.setKey(KEY_NEUTRAL);
mPreferenceScreen.addPreference(mPreferenceCategory); mPreferenceScreen.addPreference(mPreferenceCategory);
mPreferenceScreen.addPreference(mNotSpecifiedPreference); mPreferenceScreen.addPreference(mNotSpecifiedPreference);
@@ -95,8 +95,8 @@ public class TermsOfAddressNotSpecifiedControllerTest {
@Test @Test
@Ignore("b/339543490") @Ignore("b/339543490")
public void displayPreference_setGrammaticalGenderIsNotSpecified_NotSpecifiedIsSelected() { public void displayPreference_setGrammaticalGenderIsNotSpecified_NotSpecifiedIsSelected() {
TickButtonPreference selectedPreference = SelectorWithWidgetPreference selectedPreference =
(TickButtonPreference) mPreferenceScreen.getPreference(1); (SelectorWithWidgetPreference) mPreferenceScreen.getPreference(1);
selectedPreference.performClick(); selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_NOT_SPECIFIED); assertThat(selectedPreference.getKey()).isEqualTo(KEY_NOT_SPECIFIED);