Merge "Added display name overrides for non-DST version of Brazilian time zones" into jb-mr2-dev
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 72ca727..c8d6eed 100644
--- a/src/com/android/timezonepicker/TimeZoneInfo.java
+++ b/src/com/android/timezonepicker/TimeZoneInfo.java
@@ -337,7 +337,11 @@
}
// 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()));
+
}
}
