From c3e5a82691ac9094189a000430eab939e9020b2b Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 16 May 2016 13:35:56 -0400
Subject: [PATCH] Use standalone capitalization for month labels

Bug: 28020439
Change-Id: I85169a78142a43ff2348e0b561a7aa995544a65e
---
 core/java/android/widget/DatePickerCalendarDelegate.java | 4 +++-
 core/java/android/widget/SimpleMonthView.java            | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/DatePickerCalendarDelegate.java b/core/java/android/widget/DatePickerCalendarDelegate.java
index 332e89cc9653b..0a23b34b91953 100755
--- a/core/java/android/widget/DatePickerCalendarDelegate.java
+++ b/core/java/android/widget/DatePickerCalendarDelegate.java
@@ -24,6 +24,8 @@ import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.icu.text.DisplayContext;
+import android.icu.text.SimpleDateFormat;
 import android.os.Parcelable;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
@@ -38,7 +40,6 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.DayPickerView.OnDaySelectedListener;
 import android.widget.YearPickerView.OnYearSelectedListener;
 
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;
 
@@ -303,6 +304,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
         // Update the date formatter.
         final String datePattern = DateFormat.getBestDateTimePattern(locale, "EMMMd");
         mMonthDayFormat = new SimpleDateFormat(datePattern, locale);
+        mMonthDayFormat.setContext(DisplayContext.CAPITALIZATION_FOR_STANDALONE);
         mYearFormat = new SimpleDateFormat("y", locale);
 
         // Update the header text.
diff --git a/core/java/android/widget/SimpleMonthView.java b/core/java/android/widget/SimpleMonthView.java
index d8c7c359bf4a3..97d834a85681a 100644
--- a/core/java/android/widget/SimpleMonthView.java
+++ b/core/java/android/widget/SimpleMonthView.java
@@ -30,6 +30,7 @@ import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.Rect;
 import android.graphics.Typeface;
+import android.icu.text.DisplayContext;
 import android.icu.text.SimpleDateFormat;
 import android.os.Bundle;
 import android.text.TextPaint;
@@ -184,6 +185,7 @@ class SimpleMonthView extends View {
     private void updateMonthYearLabel() {
         final String format = DateFormat.getBestDateTimePattern(mLocale, MONTH_YEAR_FORMAT);
         final SimpleDateFormat formatter = new SimpleDateFormat(format, mLocale);
+        formatter.setContext(DisplayContext.CAPITALIZATION_FOR_STANDALONE);
         mMonthYearLabel = formatter.format(mCalendar.getTime());
     }