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

Merge "Tweak DateFormat.is24HourFormat javadoc to be more explicit."

Browse Source 
am: 093c509c40

Change-Id: I562562c1abc3a5a64820ca5eaa244f00a75c4200
This commit is contained in:
Przemyslaw Szczepaniak
2018-03-01 16:37:13 +00:00
committed by android-build-merger
parent 9ee9e6b2b6 093c509c40
commit 031b91574d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/text/format/DateFormat.java
View File

@@ -158,9 +158,9 @@ public class DateFormat {
private static Locale sIs24HourLocale; private static Locale sIs24HourLocale;
private static boolean sIs24Hour; private static boolean sIs24Hour;
/** /**
* Returns true if user preference is set to 24-hour format. * Returns true if times should be formatted as 24 hour times, false if times should be
* formatted as 12 hour (AM/PM) times. Based on the user's chosen locale and other preferences.
* @param context the context to use for the content resolver * @param context the context to use for the content resolver
* @return true if 24 hour time format is selected, false otherwise. * @return true if 24 hour time format is selected, false otherwise.
*/ */
@@ -169,7 +169,8 @@ public class DateFormat {
} }
/** /**
* Returns true if user preference with the given user handle is set to 24-hour format. * Returns true if times should be formatted as 24 hour times, false if times should be
* formatted as 12 hour (AM/PM) times. Based on the user's chosen locale and other preferences.
* @param context the context to use for the content resolver * @param context the context to use for the content resolver
* @param userHandle the user handle of the user to query. * @param userHandle the user handle of the user to query.
* @return true if 24 hour time format is selected, false otherwise. * @return true if 24 hour time format is selected, false otherwise.