resolved conflicts for merge of 864d1139 to master

Change-Id: Id6c7daeccf202c6d0c73c8a536e09d39173288d4

1 files changed, 27 insertions, 0 deletions

diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index 1d80565e..44a2b04c 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -31,12 +31,15 @@ import android.graphics.drawable.GradientDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.Log;
 
 import java.util.Calendar;
+import java.util.Formatter;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
@@ -71,6 +74,9 @@ public class Utils {
     public static final String INTENT_KEY_VIEW_TYPE = "VIEW";
     public static final String INTENT_VALUE_VIEW_TYPE_DAY = "DAY";
 
+    private static StringBuilder mSB = new StringBuilder(50);
+    private static Formatter mF = new Formatter(mSB, Locale.getDefault());
+
     private volatile static boolean mFirstTZRequest = true;
     private volatile static boolean mTZQueryInProgress = false;
 
@@ -188,6 +194,27 @@ public class Utils {
         return prefs.getString(key, defaultValue);
     }
 
+    /**
+     * Formats a date or a time range according to the local conventions.
+     *
+     * @param context the context is required only if the time is shown
+     * @param startMillis the start time in UTC milliseconds
+     * @param endMillis the end time in UTC milliseconds
+     * @param flags a bit mask of options See
+     * {@link #formatDateRange(Context, Formatter, long, long, int, String) formatDateRange}
+     * @return a string containing the formatted date/time range.
+     */
+    public static String formatDateRange(Context context, long startMillis,
+            long endMillis, int flags) {
+        String date;
+        synchronized (mSB) {
+            mSB.setLength(0);
+            date = DateUtils.formatDateRange(context, mF, startMillis, endMillis, flags,
+                    getTimeZone(context, null)).toString();
+        }
+        return date;
+    }
+
     public static int getSharedPreference(Context context, String key, int defaultValue) {
         SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(context);
         return prefs.getInt(key, defaultValue);