commit ec3fc0a6415319a5f4f292b8f3d95eb400b33fbc
author Karl Rosaen <krosaen@android.com> Fri Sep 18 12:05:51 2009 -0700
committer Karl Rosaen <krosaen@android.com> Fri Sep 18 12:22:30 2009 -0700
tree 453c74b48274a9ca4e0c22d88367ca5c90d926e9
parent 871be31f54c9a87a661b099c59141dad33a0192c

Tweak the lock screen date format to be like "Fri, Sep 18, 2009".

policy/com/android/internal/policy/impl/LockScreen.java

diff --git a/policy/com/android/internal/policy/impl/LockScreen.java b/policy/com/android/internal/policy/impl/LockScreen.java
index 2226326c..2977622 100644
--- a/policy/com/android/internal/policy/impl/LockScreen.java
+++ b/policy/com/android/internal/policy/impl/LockScreen.java
@@ -33,6 +33,7 @@
 import com.android.internal.telephony.IccCard;
 
 import java.util.Date;
+import java.text.SimpleDateFormat;
 
 /**
  * The screen within {@link LockPatternKeyguardView} that shows general
@@ -76,7 +77,9 @@
     private Drawable mChargingIcon = null;
 
     private boolean mSilentMode;
-    private AudioManager mAudioManager;    
+    private AudioManager mAudioManager;
+    private java.text.DateFormat mDateFormat;
+    private java.text.DateFormat mTimeFormat;
 
     /**
      * The status of this lock screen.
@@ -177,6 +180,9 @@
 
         refreshBatteryStringAndIcon();
         refreshAlarmDisplay();
+
+        mTimeFormat = DateFormat.getTimeFormat(getContext());
+        mDateFormat = getLockScreenDateFormat();
         refreshTimeAndDateDisplay();
         updateStatusLines();
 
@@ -303,8 +309,29 @@
 
     private void refreshTimeAndDateDisplay() {
         Date now = new Date();
-        mTime.setText(DateFormat.getTimeFormat(getContext()).format(now));
-        mDate.setText(DateFormat.getMediumDateFormat(getContext()).format(now));
+        mTime.setText(mTimeFormat.format(now));
+        mDate.setText(mDateFormat.format(now));
+    }
+
+    /**
+     * @return A localized format like "Fri, Sep 18, 2009"
+     */
+    private java.text.DateFormat getLockScreenDateFormat() {
+        SimpleDateFormat adjusted = null;
+        try {
+            // this call gives us the localized order
+            final SimpleDateFormat dateFormat = (SimpleDateFormat)
+                    java.text.DateFormat.getDateInstance(java.text.DateFormat.FULL);
+            adjusted = new SimpleDateFormat(dateFormat.toPattern()
+                    .replace("MMMM", "MMM")    // we want "Sep", not "September"
+                    .replace("EEEE", "EEE"));  // we want "Fri", no "Friday"
+        } catch (ClassCastException e) {
+            // in case the library implementation changes and this throws a class cast exception
+            // or anything else that is funky
+            Log.e("LockScreen", "couldn't finnagle our custom date format :(", e);
+            return java.text.DateFormat.getDateInstance(java.text.DateFormat.MEDIUM);
+        }
+        return adjusted;
     }
 
     private void updateStatusLines() {