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

Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""

Browse Source 
This reverts commit 9ebc27c73e.

Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
This commit is contained in:
Narayan Kamath
2014-03-11 13:05:37 +00:00
parent 9ebc27c73e
commit 0a2bc1cc76
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@ 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.os.SystemClock;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
@@ -42,7 +41,6 @@ import android.text.format.DateFormat;
import android.view.View; import android.view.View;
import android.widget.DatePicker; import android.widget.DatePicker;
import android.widget.TimePicker; import android.widget.TimePicker;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
@@ -308,9 +306,10 @@ 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) {
set24Hour(((CheckBoxPreference)mTime24Pref).isChecked()); final boolean is24Hour = ((CheckBoxPreference)mTime24Pref).isChecked();
set24Hour(is24Hour);
updateTimeAndDateDisplay(getActivity()); updateTimeAndDateDisplay(getActivity());
timeUpdated(); timeUpdated(is24Hour);
} }
return super.onPreferenceTreeClick(preferenceScreen, preference); return super.onPreferenceTreeClick(preferenceScreen, preference);
} }
@@ -321,8 +320,9 @@ public class DateTimeSettings extends SettingsPreferenceFragment
updateTimeAndDateDisplay(getActivity()); updateTimeAndDateDisplay(getActivity());
} }
private void timeUpdated() { private void timeUpdated(boolean is24Hour) {
Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED); Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED);
timeChanged.putExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, is24Hour);
getActivity().sendBroadcast(timeChanged); getActivity().sendBroadcast(timeChanged);
} }