diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-11 15:07:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-11 15:07:14 +0000 |
| commit | c776bbb1562b844297260790fd1a50382396a3f9 (patch) | |
| tree | 7fe4134b73920775ccc71763ce07b0116b04b5ca /src/com | |
| parent | 85fb88ee10c6bb901d30e50038b4a86252ff8c68 (diff) | |
| parent | 0a2bc1cc760143e91a7a7cc3f5182e50c0009fcd (diff) | |
| download | packages_apps_Settings-c776bbb1562b844297260790fd1a50382396a3f9.zip packages_apps_Settings-c776bbb1562b844297260790fd1a50382396a3f9.tar.gz packages_apps_Settings-c776bbb1562b844297260790fd1a50382396a3f9.tar.bz2 | |
Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/DateTimeSettings.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index f02f838..77561bd 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -28,7 +28,6 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; -import android.os.SystemClock; import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; @@ -42,7 +41,6 @@ import android.text.format.DateFormat; import android.view.View; import android.widget.DatePicker; import android.widget.TimePicker; - import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -308,9 +306,10 @@ public class DateTimeSettings extends SettingsPreferenceFragment removeDialog(DIALOG_TIMEPICKER); showDialog(DIALOG_TIMEPICKER); } else if (preference == mTime24Pref) { - set24Hour(((CheckBoxPreference)mTime24Pref).isChecked()); + final boolean is24Hour = ((CheckBoxPreference)mTime24Pref).isChecked(); + set24Hour(is24Hour); updateTimeAndDateDisplay(getActivity()); - timeUpdated(); + timeUpdated(is24Hour); } return super.onPreferenceTreeClick(preferenceScreen, preference); } @@ -321,8 +320,9 @@ public class DateTimeSettings extends SettingsPreferenceFragment updateTimeAndDateDisplay(getActivity()); } - private void timeUpdated() { + private void timeUpdated(boolean is24Hour) { Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED); + timeChanged.putExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, is24Hour); getActivity().sendBroadcast(timeChanged); } |