Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert the time zone display name logic" into oc-dev

Browse Source 
am: d9b1697b2d

Change-Id: I0b71a7b1e52c57658b7cef1521b16c15e1f2481d
This commit is contained in:
Lei Yu
2017-06-15 02:14:09 +00:00
committed by android-build-merger
parent 95332490fe d9b1697b2d
commit 08cd707bad
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
View File

@@ -88,21 +88,16 @@ public class ZoneGetter {
private static final String XMLTAG_TIMEZONE = "timezone"; private static final String XMLTAG_TIMEZONE = "timezone";
public static CharSequence getTimeZoneOffsetAndName(Context context, TimeZone tz, Date now) { public static CharSequence getTimeZoneOffsetAndName(Context context, TimeZone tz, Date now) {
final Locale locale = Locale.getDefault(); Locale locale = Locale.getDefault();
final CharSequence gmtText = getGmtOffsetText(context, locale, tz, now); CharSequence gmtText = getGmtOffsetText(context, locale, tz, now);
final TimeZoneNames timeZoneNames = TimeZoneNames.getInstance(locale); TimeZoneNames timeZoneNames = TimeZoneNames.getInstance(locale);
final ZoneGetterData data = new ZoneGetterData(context); String zoneNameString = getZoneLongName(timeZoneNames, tz, now);
if (zoneNameString == null) {
final boolean useExemplarLocationForLocalNames =
shouldUseExemplarLocationForLocalNames(data, timeZoneNames);
final CharSequence zoneName = getTimeZoneDisplayName(data, timeZoneNames,
useExemplarLocationForLocalNames, tz, tz.getID());
if (zoneName == null) {
return gmtText; return gmtText;
} }
// We don't use punctuation here to avoid having to worry about localizing that too! // We don't use punctuation here to avoid having to worry about localizing that too!
return TextUtils.concat(gmtText, " ", zoneName); return TextUtils.concat(gmtText, " ", zoneNameString);
} }
public static List<Map<String, Object>> getZonesList(Context context) { public static List<Map<String, Object>> getZonesList(Context context) {

6
packages/SettingsLib/tests/integ/src/com/android/settingslib/utils/ZoneGetterTest.java
View File

@@ -47,9 +47,9 @@ public class ZoneGetterTest {
} }
@Test @Test
public void getTimeZoneOffsetAndName_setLondon_returnLondon() { public void getTimeZoneOffsetAndName_setLondon_returnBritishSummerTime() {
// Check it will ends with 'London', not 'British Summer Time' or sth else // Check it will ends with 'British Summer Time', not 'London' or sth else
testTimeZoneOffsetAndNameInner(TIME_ZONE_LONDON_ID, "London"); testTimeZoneOffsetAndNameInner(TIME_ZONE_LONDON_ID, "British Summer Time");
} }
@Test @Test