Merge "Remove @CorePlatformApi LocaleData usage in frameworks" am: 3f89b904a8 am: 226e3d7641

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1367376

Change-Id: Ib23a5ff1491c89d5cd0f962b1f609c988111c18b

1 files changed, 3 insertions, 3 deletions

diff --git a/core/java/android/widget/SimpleMonthView.java b/core/java/android/widget/SimpleMonthView.java
index 61c77bc2f90e..695a253a04e0 100644
--- a/core/java/android/widget/SimpleMonthView.java
+++ b/core/java/android/widget/SimpleMonthView.java
@@ -27,6 +27,7 @@ import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.Rect;
 import android.graphics.Typeface;
+import android.icu.text.DateFormatSymbols;
 import android.icu.text.DisplayContext;
 import android.icu.text.RelativeDateTimeFormatter;
 import android.icu.text.SimpleDateFormat;
@@ -50,8 +51,6 @@ import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 import com.android.internal.R;
 import com.android.internal.widget.ExploreByTouchHelper;
 
-import libcore.icu.LocaleData;
-
 import java.text.NumberFormat;
 import java.util.Locale;
 
@@ -194,7 +193,8 @@ class SimpleMonthView extends View {
     private void updateDayOfWeekLabels() {
         // Use tiny (e.g. single-character) weekday names from ICU. The indices
         // for this list correspond to Calendar days, e.g. SUNDAY is index 1.
-        final String[] tinyWeekdayNames = LocaleData.get(mLocale).tinyWeekdayNames;
+        final String[] tinyWeekdayNames = DateFormatSymbols.getInstance(mLocale)
+            .getWeekdays(DateFormatSymbols.FORMAT, DateFormatSymbols.NARROW);
         for (int i = 0; i < DAYS_IN_WEEK; i++) {
             mDayOfWeekLabels[i] = tinyWeekdayNames[(mWeekStart + i - 1) % DAYS_IN_WEEK + 1];
         }