diff options
| author | Michael Chan <mchan@android.com> | 2013-04-10 22:17:08 -0700 |
|---|---|---|
| committer | Michael Chan <mchan@android.com> | 2013-04-10 22:17:08 -0700 |
| commit | 5e905dfdd9c374ddf708d19062501038211356d2 (patch) | |
| tree | 636c128e1c0f63881b35d99b426cd7bec63873a2 | |
| parent | 2611b61fe86dcf46af7bb6ca63753839a569e1cc (diff) | |
| download | android_frameworks_opt_timezonepicker-5e905dfdd9c374ddf708d19062501038211356d2.tar.gz android_frameworks_opt_timezonepicker-5e905dfdd9c374ddf708d19062501038211356d2.tar.bz2 android_frameworks_opt_timezonepicker-5e905dfdd9c374ddf708d19062501038211356d2.zip | |
Added display name overrides for non-DST version of Brazilian time zones
Bug: 8558228
Change-Id: I1cbab606535acae9ef5382fe5715949acea13c68
| -rw-r--r-- | res/values/arrays.xml | 16 | ||||
| -rw-r--r-- | src/com/android/timezonepicker/TimeZoneInfo.java | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 56e6564..c14d046 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -70,7 +70,13 @@ <item>"Europe/Minsk"</item> <!-- Only had GMT as the display string --> <item>"Europe/Kaliningrad"</item> - </string-array> + + <!-- Brazil --> + <!-- Non DST version --> + <item>"America/Porto_Velho"</item> + <!-- Non DST version --> + <item>"America/Belem"</item> +</string-array> <!-- Replacement display strings for time zones. The order should match the entries in @@ -110,6 +116,12 @@ <item>"Atlantic Standard Time"</item> <item>"Eastern European Time"</item> <item>"Kaliningrad Time"</item> - </string-array> + + <!-- Brazil --> + <!-- Non DST version of Amazon Standard Time --> + <item>"Amazon - Rondônia"</item> + <!-- Non DST version of Brasilia Standard Time --> + <item>"Brasilia - Pará"</item> + </string-array> </resources>
\ No newline at end of file diff --git a/src/com/android/timezonepicker/TimeZoneInfo.java b/src/com/android/timezonepicker/TimeZoneInfo.java index 3cc2f92..38cc855 100644 --- a/src/com/android/timezonepicker/TimeZoneInfo.java +++ b/src/com/android/timezonepicker/TimeZoneInfo.java @@ -335,7 +335,11 @@ public class TimeZoneInfo implements Comparable<TimeZoneInfo> { } // Finally diff by display name + if (mDisplayName != null && other.mDisplayName != null) + return this.mDisplayName.compareTo(other.mDisplayName); + return this.mTz.getDisplayName(Locale.getDefault()).compareTo( other.mTz.getDisplayName(Locale.getDefault())); + } } |