Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38

Browse Source 
am: 98f03f4980

Change-Id: Ia6592370da446e43896fb56d12f734841e137d49
This commit is contained in:
Neil Fuller
2016-11-15 16:57:32 +00:00
committed by android-build-merger
parent 0a5b88e286 98f03f4980
commit ef34053f26
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/ActivityThread.java
View File

@@ -5177,7 +5177,14 @@ public final class ActivityThread {
} }
updateDefaultDensity(); updateDefaultDensity();
final boolean is24Hr = "24".equals(mCoreSettings.getString(Settings.System.TIME_12_24)); final String use24HourSetting = mCoreSettings.getString(Settings.System.TIME_12_24);
Boolean is24Hr = null;
if (use24HourSetting != null) {
is24Hr = "24".equals(use24HourSetting) ? Boolean.TRUE : Boolean.FALSE;
}
// null : use locale default for 12/24 hour formatting,
// false : use 12 hour format,
// true : use 24 hour format.
DateFormat.set24HourTimePref(is24Hr); DateFormat.set24HourTimePref(is24Hr);
View.mDebugViewAttributes = View.mDebugViewAttributes =