diff options
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java index 1cb255bf8973..a8262c8cc4c8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java +++ b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.res.XmlResourceParser; import android.icu.text.TimeZoneFormat; import android.icu.text.TimeZoneNames; +import android.support.annotation.VisibleForTesting; import android.support.v4.text.BidiFormatter; import android.support.v4.text.TextDirectionHeuristicsCompat; import android.text.SpannableString; @@ -32,6 +33,8 @@ import android.view.View; import com.android.settingslib.R; +import libcore.util.TimeZoneFinder; + import org.xmlpull.v1.XmlPullParserException; import java.util.ArrayList; @@ -43,7 +46,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TimeZone; -import libcore.util.TimeZoneFinder; /** * ZoneGetter is the utility class to get time zone and zone list, and both of them have display @@ -350,7 +352,8 @@ public class ZoneGetter { return gmtText; } - private static final class ZoneGetterData { + @VisibleForTesting + public static final class ZoneGetterData { public final String[] olsonIdsToDisplay; public final CharSequence[] gmtOffsetTexts; public final TimeZone[] timeZones; @@ -377,9 +380,13 @@ public class ZoneGetter { } // Create a lookup of local zone IDs. - List<String> zoneIds = - TimeZoneFinder.getInstance().lookupTimeZoneIdsByCountry(locale.getCountry()); + final List<String> zoneIds = lookupTimeZoneIdsByCountry(locale.getCountry()); localZoneIds = new HashSet<>(zoneIds); } + + @VisibleForTesting + public List<String> lookupTimeZoneIdsByCountry(String country) { + return TimeZoneFinder.getInstance().lookupTimeZoneIdsByCountry(country); + } } } |