diff options
author | Elliott Hughes <enh@google.com> | 2013-06-25 10:16:27 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2013-06-25 10:16:27 -0700 |
commit | 81faf895d7654322d46e1254bd9f75d915c78622 (patch) | |
tree | 95c0101d7a25fca050a1967333f0d2876f35d696 /src/com/android/settings/DateTimeSettings.java | |
parent | 02e23fb0eb96280c7874d8b5d65b56bb9fc284ba (diff) | |
download | packages_apps_Settings-81faf895d7654322d46e1254bd9f75d915c78622.zip packages_apps_Settings-81faf895d7654322d46e1254bd9f75d915c78622.tar.gz packages_apps_Settings-81faf895d7654322d46e1254bd9f75d915c78622.tar.bz2 |
Use SimpleDateFormat for time zone formatting.
There's no need to do time zone formatting manually.
Change-Id: Ibef222d11d04a327e9ef64ddc48322558028555d
Diffstat (limited to 'src/com/android/settings/DateTimeSettings.java')
-rw-r--r-- | src/com/android/settings/DateTimeSettings.java | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 83adf27..6c6553b 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -39,6 +39,7 @@ import android.text.format.DateFormat; import android.widget.DatePicker; import android.widget.TimePicker; +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; @@ -372,40 +373,10 @@ public class DateTimeSettings extends SettingsPreferenceFragment } } - /* Helper routines to format timezone */ - - /* package */ static String getTimeZoneText(TimeZone tz) { - // Similar to new SimpleDateFormat("'GMT'Z, zzzz").format(new Date()), but - // we want "GMT-03:00" rather than "GMT-0300". - Date now = new Date(); - return formatOffset(new StringBuilder(), tz, now). - append(", "). - append(tz.getDisplayName(tz.inDaylightTime(now), TimeZone.LONG)).toString(); - } - - private static StringBuilder formatOffset(StringBuilder sb, TimeZone tz, Date d) { - int off = tz.getOffset(d.getTime()) / 1000 / 60; - - sb.append("GMT"); - if (off < 0) { - sb.append('-'); - off = -off; - } else { - sb.append('+'); - } - - int hours = off / 60; - int minutes = off % 60; - - sb.append((char) ('0' + hours / 10)); - sb.append((char) ('0' + hours % 10)); - - sb.append(':'); - - sb.append((char) ('0' + minutes / 10)); - sb.append((char) ('0' + minutes % 10)); - - return sb; + private static String getTimeZoneText(TimeZone tz) { + SimpleDateFormat sdf = new SimpleDateFormat("ZZZZ, zzzz"); + sdf.setTimeZone(tz); + return sdf.format(new Date()); } private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { |