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

Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

Browse Source 
Per UX request, use a Switch for:

- Automatic date & time
- Automatic time zone
- Use 24-hour format

Change-Id: Ie35816febe2469705446fdd2c703b52ff8b0929a
This commit is contained in:
Fabrice Di Meglio
2014-10-13 16:02:25 -07:00
parent 4ed4249ccd
commit b98c40649e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/date_time_prefs.xml
View File

@@ -19,13 +19,13 @@
android:title="@string/date_and_time" android:title="@string/date_and_time"
settings:keywords="@string/keywords_date_and_time"> settings:keywords="@string/keywords_date_and_time">
<CheckBoxPreference android:key="auto_time" <SwitchPreference android:key="auto_time"
android:title="@string/date_time_auto" android:title="@string/date_time_auto"
android:summaryOn="@string/date_time_auto_summaryOn" android:summaryOn="@string/date_time_auto_summaryOn"
android:summaryOff="@string/date_time_auto_summaryOff" android:summaryOff="@string/date_time_auto_summaryOff"
/> />
<CheckBoxPreference android:key="auto_zone" <SwitchPreference android:key="auto_zone"
android:title="@string/zone_auto" android:title="@string/zone_auto"
android:summaryOn="@string/zone_auto_summaryOn" android:summaryOn="@string/zone_auto_summaryOn"
android:summaryOff="@string/zone_auto_summaryOff" android:summaryOff="@string/zone_auto_summaryOff"
@@ -48,7 +48,7 @@
android:summary="GMT-8:00" android:summary="GMT-8:00"
/> />
<CheckBoxPreference android:key="24 hour" <SwitchPreference android:key="24 hour"
android:title="@string/date_time_24hour" android:title="@string/date_time_24hour"
/> />

14
src/com/android/settings/DateTimeSettings.java
View File

@@ -29,10 +29,10 @@ import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.preference.SwitchPreference;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException; import android.provider.Settings.SettingNotFoundException;
import android.text.BidiFormatter; import android.text.BidiFormatter;
@@ -69,10 +69,10 @@ public class DateTimeSettings extends SettingsPreferenceFragment
// have we been launched from the setup wizard? // have we been launched from the setup wizard?
protected static final String EXTRA_IS_FIRST_RUN = "firstRun"; protected static final String EXTRA_IS_FIRST_RUN = "firstRun";
private CheckBoxPreference mAutoTimePref; private SwitchPreference mAutoTimePref;
private Preference mTimePref; private Preference mTimePref;
private Preference mTime24Pref; private Preference mTime24Pref;
private CheckBoxPreference mAutoTimeZonePref; private SwitchPreference mAutoTimeZonePref;
private Preference mTimeZone; private Preference mTimeZone;
private Preference mDatePref; private Preference mDatePref;
private ListPreference mDateFormat; private ListPreference mDateFormat;
@@ -90,7 +90,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment
boolean autoTimeEnabled = getAutoState(Settings.Global.AUTO_TIME); boolean autoTimeEnabled = getAutoState(Settings.Global.AUTO_TIME);
boolean autoTimeZoneEnabled = getAutoState(Settings.Global.AUTO_TIME_ZONE); boolean autoTimeZoneEnabled = getAutoState(Settings.Global.AUTO_TIME_ZONE);
mAutoTimePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME); mAutoTimePref = (SwitchPreference) findPreference(KEY_AUTO_TIME);
DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(Context DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(Context
.DEVICE_POLICY_SERVICE); .DEVICE_POLICY_SERVICE);
@@ -108,7 +108,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment
mDummyDate = Calendar.getInstance(); mDummyDate = Calendar.getInstance();
mAutoTimePref.setChecked(autoTimeEnabled); mAutoTimePref.setChecked(autoTimeEnabled);
mAutoTimeZonePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME_ZONE); mAutoTimeZonePref = (SwitchPreference) findPreference(KEY_AUTO_TIME_ZONE);
// Override auto-timezone if it's a wifi-only device or if we're still in setup wizard. // Override auto-timezone if it's a wifi-only device or if we're still in setup wizard.
// TODO: Remove the wifiOnly test when auto-timezone is implemented based on wifi-location. // TODO: Remove the wifiOnly test when auto-timezone is implemented based on wifi-location.
if (Utils.isWifiOnly(getActivity()) || isFirstRun) { if (Utils.isWifiOnly(getActivity()) || isFirstRun) {
@@ -168,7 +168,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment
getPreferenceScreen().getSharedPreferences() getPreferenceScreen().getSharedPreferences()
.registerOnSharedPreferenceChangeListener(this); .registerOnSharedPreferenceChangeListener(this);
((CheckBoxPreference)mTime24Pref).setChecked(is24Hour()); ((SwitchPreference)mTime24Pref).setChecked(is24Hour());
// Register for time ticks and other reasons for time change // Register for time ticks and other reasons for time change
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
@@ -318,7 +318,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment
removeDialog(DIALOG_TIMEPICKER); removeDialog(DIALOG_TIMEPICKER);
showDialog(DIALOG_TIMEPICKER); showDialog(DIALOG_TIMEPICKER);
} else if (preference == mTime24Pref) { } else if (preference == mTime24Pref) {
final boolean is24Hour = ((CheckBoxPreference)mTime24Pref).isChecked(); final boolean is24Hour = ((SwitchPreference)mTime24Pref).isChecked();
set24Hour(is24Hour); set24Hour(is24Hour);
updateTimeAndDateDisplay(getActivity()); updateTimeAndDateDisplay(getActivity());
timeUpdated(is24Hour); timeUpdated(is24Hour);