1 files changed, 14 insertions, 14 deletions

diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java
index 88a67625d615..7804fd1f9f3c 100644
--- a/core/java/android/widget/TextClock.java
+++ b/core/java/android/widget/TextClock.java
@@ -30,6 +30,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.TypedArray;
 import android.database.ContentObserver;
+import android.icu.text.DateTimePatternGenerator;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.SystemClock;
@@ -43,8 +44,6 @@ import android.view.inspector.InspectableProperty;
 
 import com.android.internal.R;
 
-import libcore.icu.LocaleData;
-
 import java.util.Calendar;
 import java.util.TimeZone;
 
@@ -259,14 +258,11 @@ public class TextClock extends TextView {
     }
 
     private void init() {
-        if (mFormat12 == null || mFormat24 == null) {
-            LocaleData ld = LocaleData.get(getContext().getResources().getConfiguration().locale);
-            if (mFormat12 == null) {
-                mFormat12 = ld.timeFormat_hm;
-            }
-            if (mFormat24 == null) {
-                mFormat24 = ld.timeFormat_Hm;
-            }
+        if (mFormat12 == null) {
+            mFormat12 = getBestDateTimePattern("hm");
+        }
+        if (mFormat24 == null) {
+            mFormat24 = getBestDateTimePattern("Hm");
         }
 
         createTime(mTimeZone);
@@ -508,13 +504,11 @@ public class TextClock extends TextView {
     private void chooseFormat() {
         final boolean format24Requested = is24HourModeEnabled();
 
-        LocaleData ld = LocaleData.get(getContext().getResources().getConfiguration().locale);
-
         if (format24Requested) {
-            mFormat = abc(mFormat24, mFormat12, ld.timeFormat_Hm);
+            mFormat = abc(mFormat24, mFormat12, getBestDateTimePattern("Hm"));
             mDescFormat = abc(mDescFormat24, mDescFormat12, mFormat);
         } else {
-            mFormat = abc(mFormat12, mFormat24, ld.timeFormat_hm);
+            mFormat = abc(mFormat12, mFormat24, getBestDateTimePattern("hm"));
             mDescFormat = abc(mDescFormat12, mDescFormat24, mFormat);
         }
 
@@ -527,6 +521,12 @@ public class TextClock extends TextView {
         }
     }
 
+    private String getBestDateTimePattern(String skeleton) {
+        DateTimePatternGenerator dtpg = DateTimePatternGenerator.getInstance(
+                getContext().getResources().getConfiguration().locale);
+        return dtpg.getBestPattern(skeleton);
+    }
+
     /**
      * Returns a if not null, else return b if not null, else return c.
      */