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

Browse Source 
am: 4f5a113d8f

Change-Id: Icadc36b185da4f26c81985895569b18d9234f639
This commit is contained in:
Victor Chang
2018-03-08 18:58:32 +00:00
committed by android-build-merger
parent 7eef8156ea 4f5a113d8f
commit 894f5521ab
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/datetime/timezone/FixedOffsetPreferenceController.java
View File

@@ -17,7 +17,8 @@
package com.android.settings.datetime.timezone;
import android.content.Context;
import android.support.v7.preference.Preference;
import com.android.settings.R;
public class FixedOffsetPreferenceController extends BaseTimeZonePreferenceController {
@@ -31,8 +32,18 @@ public class FixedOffsetPreferenceController extends BaseTimeZonePreferenceContr
@Override
public CharSequence getSummary() {
// This is a Spannable object, which contains TTS span. It shouldn't be converted to String.
return mTimeZoneInfo == null ? "" : mTimeZoneInfo.getGmtOffset();
if (mTimeZoneInfo == null) {
return "";
}
String standardName = mTimeZoneInfo.getStandardName();
if (standardName == null) {
return mTimeZoneInfo.getGmtOffset();
} else {
// GmtOffset is Spannable, which contains TTS span. It shouldn't be converted to String.
return SpannableUtil.getResourcesText(mContext.getResources(),
R.string.zone_info_offset_and_name, mTimeZoneInfo.getGmtOffset(), standardName);
}
}
public void setTimeZoneInfo(TimeZoneInfo timeZoneInfo) {

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)");
}
}