summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DateTimeSettings.java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-03-11 13:05:37 +0000
committerNarayan Kamath <narayan@google.com>2014-03-11 13:05:37 +0000
commit0a2bc1cc760143e91a7a7cc3f5182e50c0009fcd (patch)
tree1acadba43c6e7045d4dc5cdb58a68b3fc85fdda5 /src/com/android/settings/DateTimeSettings.java
parent9ebc27c73e7096159024605a2c4ab1a4b3abbd83 (diff)
downloadpackages_apps_Settings-0a2bc1cc760143e91a7a7cc3f5182e50c0009fcd.zip
packages_apps_Settings-0a2bc1cc760143e91a7a7cc3f5182e50c0009fcd.tar.gz
packages_apps_Settings-0a2bc1cc760143e91a7a7cc3f5182e50c0009fcd.tar.bz2
Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
This reverts commit 9ebc27c73e7096159024605a2c4ab1a4b3abbd83. Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
Diffstat (limited to 'src/com/android/settings/DateTimeSettings.java')
-rw-r--r--src/com/android/settings/DateTimeSettings.java10
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);
}