Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: Id446433bafe4517f4822abdd1c49bfde99422a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/datetime/timezone/RegionPreferenceController.java

@@ -15,6 +15,8 @@
  */
 package com.android.settings.datetime.timezone;
 
+import static com.android.settingslib.datetime.ZoneGetter.capitalizeForStandaloneDisplay;
+
 import android.content.Context;
 import android.icu.text.LocaleDisplayNames;
 
@@ -23,19 +25,21 @@ import java.util.Locale;
 public class RegionPreferenceController extends BaseTimeZonePreferenceController {
     private static final String PREFERENCE_KEY = "region";
 
+    private final Locale mLocale;
     private final LocaleDisplayNames mLocaleDisplayNames;
     private String mRegionId = "";
 
     public RegionPreferenceController(Context context) {
         super(context, PREFERENCE_KEY);
         Locale locale = context.getResources().getConfiguration().getLocales().get(0);
+        mLocale = locale;
         mLocaleDisplayNames = LocaleDisplayNames.getInstance(locale);
-
     }
 
     @Override
     public CharSequence getSummary() {
-        return mLocaleDisplayNames.regionDisplayName(mRegionId);
+        return capitalizeForStandaloneDisplay(mLocale,
+                mLocaleDisplayNames.regionDisplayName(mRegionId));
     }
 
     public void setRegionId(String regionId) {

src/com/android/settings/datetime/timezone/RegionSearchPicker.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.datetime.timezone;
 
+import static com.android.settingslib.datetime.ZoneGetter.capitalizeForStandaloneDisplay;
+
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Intent;
@@ -116,7 +118,8 @@ public class RegionSearchPicker extends BaseTimeZonePicker {
         final LocaleDisplayNames localeDisplayNames = LocaleDisplayNames.getInstance(getLocale());
         long i = 0;
         for (String regionId : regionIds) {
-            String name = localeDisplayNames.regionDisplayName(regionId);
+            String name = capitalizeForStandaloneDisplay(
+                    mLocale, localeDisplayNames.regionDisplayName(regionId));
             items.add(new RegionItem(i++, regionId, name));
         }
         return new ArrayList<>(items);

src/com/android/settings/datetime/timezone/RegionZonePicker.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.datetime.timezone;
 
+import static com.android.settingslib.datetime.ZoneGetter.capitalizeForStandaloneDisplay;
+
 import android.app.settings.SettingsEnums;
 import android.content.Intent;
 import android.icu.text.Collator;
@@ -65,7 +67,8 @@ public class RegionZonePicker extends BaseTimeZoneInfoPicker {
         final LocaleDisplayNames localeDisplayNames = LocaleDisplayNames.getInstance(getLocale());
         final String regionId =
                 getArguments() == null ? null : getArguments().getString(EXTRA_REGION_ID);
-        mRegionName = regionId == null ? null : localeDisplayNames.regionDisplayName(regionId);
+        mRegionName = regionId == null ? null : capitalizeForStandaloneDisplay(
+                mLocale, localeDisplayNames.regionDisplayName(regionId));
     }
 
     @Override

src/com/android/settings/datetime/timezone/TimeZoneInfo.java

@@ -15,6 +15,8 @@
  */
 package com.android.settings.datetime.timezone;
 
+import static com.android.settingslib.datetime.ZoneGetter.capitalizeForStandaloneDisplay;
+
 import android.icu.text.TimeZoneFormat;
 import android.icu.text.TimeZoneNames;
 import android.icu.util.TimeZone;
@@ -152,19 +154,29 @@ public class TimeZoneInfo {
             String canonicalZoneId = getCanonicalZoneId(timeZone);
             final TimeZoneNames timeZoneNames = mTimeZoneFormat.getTimeZoneNames();
             final java.util.TimeZone javaTimeZone = toJavaTimeZone(canonicalZoneId);
-            final CharSequence gmtOffset = ZoneGetter.getGmtOffsetText(mTimeZoneFormat, mLocale,
+            final CharSequence gmtOffset =
-                javaTimeZone, mNow);
+                    ZoneGetter.getGmtOffsetText(mTimeZoneFormat, mLocale, javaTimeZone, mNow);
             return new TimeZoneInfo.Builder(timeZone)
-                    .setGenericName(timeZoneNames.getDisplayName(canonicalZoneId,
+                    .setGenericName(getTzNameForListDisplay(mLocale, timeZoneNames,
-                            TimeZoneNames.NameType.LONG_GENERIC, mNow.getTime()))
+                            canonicalZoneId, mNow, TimeZoneNames.NameType.LONG_GENERIC))
-                    .setStandardName(timeZoneNames.getDisplayName(canonicalZoneId,
+                    .setStandardName(getTzNameForListDisplay(mLocale, timeZoneNames,
-                            TimeZoneNames.NameType.LONG_STANDARD, mNow.getTime()))
+                            canonicalZoneId, mNow, TimeZoneNames.NameType.LONG_STANDARD))
-                    .setDaylightName(timeZoneNames.getDisplayName(canonicalZoneId,
+                    .setDaylightName(getTzNameForListDisplay(mLocale, timeZoneNames,
-                            TimeZoneNames.NameType.LONG_DAYLIGHT, mNow.getTime()))
+                            canonicalZoneId, mNow, TimeZoneNames.NameType.LONG_DAYLIGHT))
-                    .setExemplarLocation(timeZoneNames.getExemplarLocationName(canonicalZoneId))
+                    .setExemplarLocation(capitalizeForStandaloneDisplay(mLocale,
+                            timeZoneNames.getExemplarLocationName(canonicalZoneId)))
                     .setGmtOffset(gmtOffset)
                     .build();
         }
+
+        private static String getTzNameForListDisplay(
+                Locale locale, TimeZoneNames timeZoneNames, String canonicalZoneId, Date now,
+                TimeZoneNames.NameType nameType) {
+            long nowEpochMillis = now.getTime();
+            String displayName = timeZoneNames.getDisplayName(
+                    canonicalZoneId, nameType, nowEpochMillis);
+            return capitalizeForStandaloneDisplay(locale, displayName);
+        }
     }
 
     /* package-private */ java.util.TimeZone getJavaTimeZone() {