diff options
| author | Neil Fuller <nfuller@google.com> | 2016-11-18 16:05:40 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2016-11-21 13:56:42 +0000 |
| commit | c0cea814a1718264b17759caa371fc4eab42dbd4 (patch) | |
| tree | c3fc3d73c64f8358ca7d413c2c1a87e0fa3640c5 /src/com/android/settings/datetime | |
| parent | 9a35bc6552b072afa2f66258b96d3dc79c10a6c8 (diff) | |
| download | packages_apps_Settings-c0cea814a1718264b17759caa371fc4eab42dbd4.tar.gz packages_apps_Settings-c0cea814a1718264b17759caa371fc4eab42dbd4.tar.bz2 packages_apps_Settings-c0cea814a1718264b17759caa371fc4eab42dbd4.zip | |
Change EXTRA_TIME_PREF_24_HOUR_FORMAT from boolean to int
To better represent the possible settings values for the
"use 24 hour format" setting : "12", "24", unset (meaning
"use locale default") the platform is being changed.
The EXTRA_TIME_PREF_24_HOUR_FORMAT for the ACTION_TIME_CHANGED
is now an int, not a boolean. 0 means "12", 1 means "24" and
2 means "use locale default".
Bug: 32761619
Test: Manual test on device and make RunSettingsRoboTests
Change-Id: I9aae6f8d12c4724c829f2812626a6193e510dbf9
Diffstat (limited to 'src/com/android/settings/datetime')
| -rw-r--r-- | src/com/android/settings/datetime/TimeFormatPreferenceController.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java index 068b790612..63e1c0f7c0 100644 --- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java @@ -96,7 +96,10 @@ public class TimeFormatPreferenceController extends PreferenceController { private void timeUpdated(boolean is24Hour) { Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED); - timeChanged.putExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, is24Hour); + int timeFormatPreference = + is24Hour ? Intent.EXTRA_TIME_PREF_VALUE_USE_24_HOUR + : Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR; + timeChanged.putExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, timeFormatPreference); mContext.sendBroadcast(timeChanged); } |