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

am 57bd0615: Merge "b/3054044 Make allDay event times format in utc" into gingerbread

Browse Source 
Merge commit '57bd0615fa48124c4607fbb1ba09a7c7160be146' into gingerbread-plus-aosp

* commit '57bd0615fa48124c4607fbb1ba09a7c7160be146':
  b/3054044 Make allDay event times format in utc
This commit is contained in:
Erik
2010-10-01 11:10:59 -07:00
committed by Android Git Automerger
parent 14401bf7bc 57bd0615fa
commit 277465fb5b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/util/CalendarUtils.java
View File

@@ -146,6 +146,9 @@ public class CalendarUtils {
* This formats a date/time range using Calendar's time zone and the * This formats a date/time range using Calendar's time zone and the
* local conventions for the region of the device. * local conventions for the region of the device.
* *
* If the {@link DateUtils#FORMAT_UTC} flag is used it will pass in
* the UTC time zone instead.
*
* @param context the context is required only if the time is shown * @param context the context is required only if the time is shown
* @param startMillis the start time in UTC milliseconds * @param startMillis the start time in UTC milliseconds
* @param endMillis the end time in UTC milliseconds * @param endMillis the end time in UTC milliseconds
@@ -156,10 +159,16 @@ public class CalendarUtils {
public String formatDateRange(Context context, long startMillis, public String formatDateRange(Context context, long startMillis,
long endMillis, int flags) { long endMillis, int flags) {
String date; String date;
String tz;
if ((flags & DateUtils.FORMAT_UTC) != 0) {
tz = Time.TIMEZONE_UTC;
} else {
tz = getTimeZone(context, null);
}
synchronized (mSB) { synchronized (mSB) {
mSB.setLength(0); mSB.setLength(0);
date = DateUtils.formatDateRange(context, mF, startMillis, endMillis, flags, date = DateUtils.formatDateRange(context, mF, startMillis, endMillis, flags,
getTimeZone(context, null)).toString(); tz).toString();
} }
return date; return date;
} }