diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-04-28 15:21:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-28 15:21:37 -0700 |
| commit | 087b25f7e2669497cf217d873437e8726c139abd (patch) | |
| tree | 63bc57242723233fa1447b0e358113c5b5940e2a /services/java | |
| parent | 00b92b943ff397cb7f7c4827a0eea9df7aa22071 (diff) | |
| parent | 6e4895b63aa64a8df64dd69c49a414b7566932d3 (diff) | |
| download | frameworks_base-087b25f7e2669497cf217d873437e8726c139abd.zip frameworks_base-087b25f7e2669497cf217d873437e8726c139abd.tar.gz frameworks_base-087b25f7e2669497cf217d873437e8726c139abd.tar.bz2 | |
am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo
Merge commit '6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp
* commit '6e4895b63aa64a8df64dd69c49a414b7566932d3':
Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/status/StatusBarPolicy.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/services/java/com/android/server/status/StatusBarPolicy.java index 82050ec..94d1cb4 100644 --- a/services/java/com/android/server/status/StatusBarPolicy.java +++ b/services/java/com/android/server/status/StatusBarPolicy.java @@ -361,6 +361,9 @@ public class StatusBarPolicy { else if (action.equals(Intent.ACTION_TIMEZONE_CHANGED)) { String tz = intent.getStringExtra("time-zone"); mCalendar = Calendar.getInstance(TimeZone.getTimeZone(tz)); + if (mClockFormat != null) { + mClockFormat.setTimeZone(mCalendar.getTimeZone()); + } updateClock(); } else if (action.equals(Intent.ACTION_ALARM_CHANGED)) { |