PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show time zone standard name in FixedOffsetPreferenceController" into pi-dev am: 4f5a113d8f

Browse Source 
am: 894f5521ab

Change-Id: I1ccf2442418b0e655f7969b803a9bc09de227b44
This commit is contained in:
Victor Chang
2018-03-08 19:37:49 +00:00
committed by android-build-merger
parent 14abf8d05a 894f5521ab
commit bb61d3696c
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java
View File

@@ -40,10 +40,9 @@ public class FixedOffsetPreferenceControllerTest {
}
@Test
public void updateState_matchTimeZoneSummary() {
public void updateState_GmtMinus8_matchTimeZoneSummary() {
TimeZoneInfo fixedOffsetZone = new TimeZoneInfo.Builder(
TimeZone.getFrozenTimeZone("Etc/GMT-8"))
.setExemplarLocation("Los Angeles")
.setGmtOffset("GMT-08:00")
.setItemId(0)
.build();
@@ -52,6 +51,21 @@ public class FixedOffsetPreferenceControllerTest {
controller.setTimeZoneInfo(fixedOffsetZone);
controller.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("GMT-08:00");
}
@Test
public void updateState_Utc_matchTimeZoneSummary() {
TimeZoneInfo fixedOffsetZone = new TimeZoneInfo.Builder(
TimeZone.getFrozenTimeZone("Etc/UTC"))
.setStandardName("Coordinated Universal Time")
.setGmtOffset("GMT+00:00")
.setItemId(0)
.build();
Preference preference = new Preference(mActivity);
FixedOffsetPreferenceController controller = new FixedOffsetPreferenceController(mActivity);
controller.setTimeZoneInfo(fixedOffsetZone);
controller.updateState(preference);
assertThat(preference.getSummary().toString())
.isEqualTo("Coordinated Universal Time (GMT+00:00)");
}
}