diff options
author | x10f <android.x10f@gmail.com> | 2014-12-29 14:19:17 -0500 |
---|---|---|
committer | Raj P <android.x10f@gmail.com> | 2014-12-29 06:19:49 +0000 |
commit | 3217128e7719ad7691c55b29456a80ae5953358e (patch) | |
tree | 170382bbbd41e35a52d802b79dda062567e05b3c | |
parent | 58bb79b3c83f841ff0356a6d7ce9a6c8f3d0756a (diff) | |
download | android_packages_apps_DeskClock-3217128e7719ad7691c55b29456a80ae5953358e.tar.gz android_packages_apps_DeskClock-3217128e7719ad7691c55b29456a80ae5953358e.tar.bz2 android_packages_apps_DeskClock-3217128e7719ad7691c55b29456a80ae5953358e.zip |
DeskClock : Settings- Checkboxes to switches
As recommended: http://developer.android.com/design/building-blocks/switches.html
This also adds some more design consistency.
Change-Id: I91ed4168d6b61fa9192c151b5bafca713fafed9b
-rw-r--r-- | res/xml/dream_settings.xml | 2 | ||||
-rw-r--r-- | res/xml/settings.xml | 4 | ||||
-rw-r--r-- | src/com/android/deskclock/SettingsActivity.java | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml index 5c7a3e135..77ecfa2a5 100644 --- a/res/xml/dream_settings.xml +++ b/res/xml/dream_settings.xml @@ -22,7 +22,7 @@ android:entryValues="@array/clock_style_values" android:defaultValue="@string/default_clock_style" android:dialogTitle="@string/clock_style" /> - <CheckBoxPreference + <SwitchPreference android:key="screensaver_night_mode" android:title="@string/night_mode_title" android:summary="@string/night_mode_summary" diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 28e65f062..505c6c70b 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -27,7 +27,7 @@ android:entryValues="@array/clock_style_values" android:defaultValue="@string/default_clock_style" android:dialogTitle="@string/clock_style" /> - <CheckBoxPreference + <SwitchPreference android:key="automatic_home_clock" android:title="@string/automatic_home_clock" android:summary="@string/automatic_home_clock_summary" @@ -86,7 +86,7 @@ android:entryValues="@array/volume_button_setting_values" android:defaultValue="0" /> - <CheckBoxPreference + <SwitchPreference android:key="show_status_bar_icon" android:title="@string/show_status_bar_icon_title" android:summary="@string/show_status_bar_icon_summary" diff --git a/src/com/android/deskclock/SettingsActivity.java b/src/com/android/deskclock/SettingsActivity.java index 8764636bc..c9c01ed32 100644 --- a/src/com/android/deskclock/SettingsActivity.java +++ b/src/com/android/deskclock/SettingsActivity.java @@ -24,11 +24,11 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.media.AudioManager; import android.os.Bundle; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.provider.Settings; import android.text.format.DateUtils; import android.view.Menu; @@ -83,7 +83,7 @@ public class SettingsActivity extends PreferenceActivity private static CharSequence[][] mTimezones; private static Locale mLocale; private long mTime; - private CheckBoxPreference mAlarmIcon; + private SwitchPreference mAlarmIcon; @Override protected void onCreate(Bundle savedInstanceState) { @@ -109,7 +109,7 @@ public class SettingsActivity extends PreferenceActivity listPref.setSummary(listPref.getEntry()); listPref.setOnPreferenceChangeListener(this); - mAlarmIcon = (CheckBoxPreference) findPreference(KEY_SHOW_STATUS_BAR_ICON); + mAlarmIcon = (SwitchPreference) findPreference(KEY_SHOW_STATUS_BAR_ICON); mAlarmIcon.setChecked(Settings.System.getInt(getContentResolver(), Settings.System.SHOW_ALARM_ICON, 1) == 1); } @@ -148,7 +148,7 @@ public class SettingsActivity extends PreferenceActivity public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { if (KEY_ALARM_IN_SILENT_MODE.equals(preference.getKey())) { - CheckBoxPreference pref = (CheckBoxPreference) preference; + SwitchPreference pref = (SwitchPreference) preference; int ringerModeStreamTypes = Settings.System.getInt( getContentResolver(), Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); @@ -185,7 +185,7 @@ public class SettingsActivity extends PreferenceActivity listPref.setSummary(listPref.getEntries()[idx]); notifyHomeTimeZoneChanged(); } else if (KEY_AUTO_HOME_CLOCK.equals(pref.getKey())) { - boolean state =((CheckBoxPreference) pref).isChecked(); + boolean state =((SwitchPreference) pref).isChecked(); Preference homeTimeZone = findPreference(KEY_HOME_TZ); homeTimeZone.setEnabled(!state); notifyHomeTimeZoneChanged(); @@ -245,7 +245,7 @@ public class SettingsActivity extends PreferenceActivity listPref.setOnPreferenceChangeListener(this); Preference pref = findPreference(KEY_AUTO_HOME_CLOCK); - boolean state =((CheckBoxPreference) pref).isChecked(); + boolean state =((SwitchPreference) pref).isChecked(); pref.setOnPreferenceChangeListener(this); listPref = (ListPreference)findPreference(KEY_HOME_TZ); @@ -270,7 +270,7 @@ public class SettingsActivity extends PreferenceActivity updateActionSummary(listPref, listPref.getValue(), R.string.shake_action_summary); listPref.setOnPreferenceChangeListener(this); - CheckBoxPreference hideStatusbarIcon = (CheckBoxPreference) findPreference(KEY_SHOW_STATUS_BAR_ICON); + SwitchPreference hideStatusbarIcon = (SwitchPreference) findPreference(KEY_SHOW_STATUS_BAR_ICON); hideStatusbarIcon.setOnPreferenceChangeListener(this); SnoozeLengthDialog snoozePref = (SnoozeLengthDialog) findPreference(KEY_ALARM_SNOOZE); |