Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d700bd94 authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Fix missing zone strings in some cases" am: 26f3511f am: 40a1be54 am: a234ab0c 

Change-Id: Ia1f4eb8ac77309002086f557c8e3a971cd370eff
parents e5b81474 a234ab0c

packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java

+10 −1
Original line number Diff line number Diff line
@@ -242,7 +242,16 @@ public class ZoneGetter { 
        final TimeZoneNames.NameType nameType =

                tz.inDaylightTime(now) ? TimeZoneNames.NameType.LONG_DAYLIGHT

                        : TimeZoneNames.NameType.LONG_STANDARD;

        return names.getDisplayName(tz.getID(), nameType, now.getTime());

        return names.getDisplayName(getCanonicalZoneId(tz), nameType, now.getTime());

    }



    private static String getCanonicalZoneId(TimeZone timeZone) {

        final String id = timeZone.getID();

        final String canonicalId = android.icu.util.TimeZone.getCanonicalID(id);

        if (canonicalId != null) {

            return canonicalId;

        }

        return id;

    }



    private static void appendWithTtsSpan(SpannableStringBuilder builder, CharSequence content,