Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Use ListPreference instead of DropDownPreference

Browse Source 
Change-Id: I34c21377840ec8a298f3c49e03445151eecc3ec4
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
IacobIonut01
2022-10-23 11:26:49 +02:00
committed by Joey
parent d52e5688de
commit 3f0760f894
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/automatic_storage_management_settings.xml
View File

@@ -18,7 +18,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/automatic_storage_manager_settings" > android:title="@string/automatic_storage_manager_settings" >
<DropDownPreference <ListPreference
android:key="days" android:key="days"
android:summary="%s" android:summary="%s"
android:title="@string/automatic_storage_manager_days_title" android:title="@string/automatic_storage_manager_days_title"

4
res/xml/zen_mode_event_rule_settings.xml
View File

@@ -34,13 +34,13 @@
android:key="zen_action_buttons" /> android:key="zen_action_buttons" />
<!-- During events for --> <!-- During events for -->
<DropDownPreference <ListPreference
android:key="calendar" android:key="calendar"
android:title="@string/zen_mode_event_rule_calendar" android:title="@string/zen_mode_event_rule_calendar"
android:summary="%s" /> android:summary="%s" />
<!-- Where reply is --> <!-- Where reply is -->
<DropDownPreference <ListPreference
android:key="reply" android:key="reply"
android:title="@string/zen_mode_event_rule_reply" android:title="@string/zen_mode_event_rule_reply"
android:summary="%s" /> android:summary="%s" />

6
src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
View File

@@ -25,7 +25,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import androidx.preference.DropDownPreference; import androidx.preference.ListPreference;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceChangeListener;
@@ -51,7 +51,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment
private static final String KEY_DAYS = "days"; private static final String KEY_DAYS = "days";
private AutomaticStorageManagerSwitchBarController mSwitchController; private AutomaticStorageManagerSwitchBarController mSwitchController;
private DropDownPreference mDaysToRetain; private ListPreference mDaysToRetain;
private SettingsMainSwitchBar mSwitchBar; private SettingsMainSwitchBar mSwitchBar;
@Override @Override
@@ -66,7 +66,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment
} }
private void initializeDaysToRetainPreference() { private void initializeDaysToRetainPreference() {
mDaysToRetain = (DropDownPreference) findPreference(KEY_DAYS); mDaysToRetain = (ListPreference) findPreference(KEY_DAYS);
mDaysToRetain.setOnPreferenceChangeListener(this); mDaysToRetain.setOnPreferenceChangeListener(this);
ContentResolver cr = getContentResolver(); ContentResolver cr = getContentResolver();

10
src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java
View File

@@ -28,7 +28,7 @@ import android.provider.Settings;
import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig;
import android.service.notification.ZenModeConfig.EventInfo; import android.service.notification.ZenModeConfig.EventInfo;
import androidx.preference.DropDownPreference; import androidx.preference.ListPreference;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -50,8 +50,8 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase {
public static final String ACTION = Settings.ACTION_ZEN_MODE_EVENT_RULE_SETTINGS; public static final String ACTION = Settings.ACTION_ZEN_MODE_EVENT_RULE_SETTINGS;
private DropDownPreference mCalendar; private ListPreference mCalendar;
private DropDownPreference mReply; private ListPreference mReply;
private EventInfo mEvent; private EventInfo mEvent;
@@ -128,7 +128,7 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase {
mCreate = true; mCreate = true;
final PreferenceScreen root = getPreferenceScreen(); final PreferenceScreen root = getPreferenceScreen();
mCalendar = (DropDownPreference) root.findPreference(KEY_CALENDAR); mCalendar = (ListPreference) root.findPreference(KEY_CALENDAR);
mCalendar.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { mCalendar.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -143,7 +143,7 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase {
} }
}); });
mReply = (DropDownPreference) root.findPreference(KEY_REPLY); mReply = (ListPreference) root.findPreference(KEY_REPLY);
mReply.setEntries(new CharSequence[] { mReply.setEntries(new CharSequence[] {
getString(R.string.zen_mode_event_rule_reply_any_except_no), getString(R.string.zen_mode_event_rule_reply_any_except_no),
getString(R.string.zen_mode_event_rule_reply_yes_or_maybe), getString(R.string.zen_mode_event_rule_reply_yes_or_maybe),

6
tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java
View File

@@ -35,7 +35,7 @@ import android.location.Location;
import android.location.LocationManager; import android.location.LocationManager;
import android.os.PowerManager; import android.os.PowerManager;
import androidx.preference.DropDownPreference; import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
@@ -54,7 +54,7 @@ public class DarkModeScheduleSelectorControllerTest {
private DarkModeScheduleSelectorController mController; private DarkModeScheduleSelectorController mController;
private String mPreferenceKey = "key"; private String mPreferenceKey = "key";
@Mock @Mock
private DropDownPreference mPreference; private ListPreference mPreference;
@Mock @Mock
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
private Context mContext; private Context mContext;
@@ -95,7 +95,7 @@ public class DarkModeScheduleSelectorControllerTest {
.thenReturn("custom_bedtime"); .thenReturn("custom_bedtime");
when(mResources.getStringArray(R.array.dark_ui_scheduler_with_bedtime_preference_titles)) when(mResources.getStringArray(R.array.dark_ui_scheduler_with_bedtime_preference_titles))
.thenReturn(new String[]{"never", "auto", "custom", "custom_bedtime"}); .thenReturn(new String[]{"never", "auto", "custom", "custom_bedtime"});
mPreference = spy(new DropDownPreference(mContext)); mPreference = spy(new ListPreference(mContext));
mPreference.setEntryValues(new CharSequence[]{"never", "auto", "custom"}); mPreference.setEntryValues(new CharSequence[]{"never", "auto", "custom"});
doNothing().when(mPreference).setValueIndex(anyInt()); doNothing().when(mPreference).setValueIndex(anyInt());
when(mLocationManager.isLocationEnabled()).thenReturn(true); when(mLocationManager.isLocationEnabled()).thenReturn(true);

22
tests/robotests/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2Test.java
View File

@@ -22,7 +22,7 @@ import static org.mockito.Mockito.spy;
import android.content.Context; import android.content.Context;
import androidx.preference.DropDownPreference; import androidx.preference.ListPreference;
import com.android.settings.R; import com.android.settings.R;
import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry;
@@ -47,7 +47,7 @@ public class WifiMeteredPreferenceController2Test {
private WifiMeteredPreferenceController2 mPreferenceController; private WifiMeteredPreferenceController2 mPreferenceController;
private Context mContext; private Context mContext;
private DropDownPreference mDropDownPreference; private ListPreference mListPreference;
@Before @Before
public void setUp() { public void setUp() {
@@ -56,35 +56,35 @@ public class WifiMeteredPreferenceController2Test {
mPreferenceController = spy( mPreferenceController = spy(
new WifiMeteredPreferenceController2(mContext, mWifiEntry)); new WifiMeteredPreferenceController2(mContext, mWifiEntry));
mDropDownPreference = new DropDownPreference(mContext); mListPreference = new ListPreference(mContext);
mDropDownPreference.setEntries(R.array.wifi_metered_entries); mListPreference.setEntries(R.array.wifi_metered_entries);
mDropDownPreference.setEntryValues(R.array.wifi_metered_values); mListPreference.setEntryValues(R.array.wifi_metered_values);
} }
@Test @Test
public void testUpdateState_wifiMetered_setCorrectValue() { public void testUpdateState_wifiMetered_setCorrectValue() {
doReturn(METERED_OVERRIDE_METERED).when(mPreferenceController).getMeteredOverride(); doReturn(METERED_OVERRIDE_METERED).when(mPreferenceController).getMeteredOverride();
mPreferenceController.updateState(mDropDownPreference); mPreferenceController.updateState(mListPreference);
assertThat(mDropDownPreference.getEntry()).isEqualTo("Treat as metered"); assertThat(mListPreference.getEntry()).isEqualTo("Treat as metered");
} }
@Test @Test
public void testUpdateState_wifiNotMetered_setCorrectValue() { public void testUpdateState_wifiNotMetered_setCorrectValue() {
doReturn(METERED_OVERRIDE_NOT_METERED).when(mPreferenceController).getMeteredOverride(); doReturn(METERED_OVERRIDE_NOT_METERED).when(mPreferenceController).getMeteredOverride();
mPreferenceController.updateState(mDropDownPreference); mPreferenceController.updateState(mListPreference);
assertThat(mDropDownPreference.getEntry()).isEqualTo("Treat as unmetered"); assertThat(mListPreference.getEntry()).isEqualTo("Treat as unmetered");
} }
@Test @Test
public void testUpdateState_wifiAuto_setCorrectValue() { public void testUpdateState_wifiAuto_setCorrectValue() {
doReturn(METERED_OVERRIDE_NONE).when(mPreferenceController).getMeteredOverride(); doReturn(METERED_OVERRIDE_NONE).when(mPreferenceController).getMeteredOverride();
mPreferenceController.updateState(mDropDownPreference); mPreferenceController.updateState(mListPreference);
assertThat(mDropDownPreference.getEntry()).isEqualTo("Detect automatically"); assertThat(mListPreference.getEntry()).isEqualTo("Detect automatically");
} }
} }