diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-04-28 15:25:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-28 15:25:05 -0700 |
| commit | 2b7012c308c908fab8b8642e70929f02228b751e (patch) | |
| tree | b96760d8fce8c09d8ae4b27ea3c11c7a2ac4afbf | |
| parent | 2bf0f1a3c153c432faa050479a8d8b4259d4999f (diff) | |
| parent | 087b25f7e2669497cf217d873437e8726c139abd (diff) | |
| download | frameworks_base-2b7012c308c908fab8b8642e70929f02228b751e.zip frameworks_base-2b7012c308c908fab8b8642e70929f02228b751e.tar.gz frameworks_base-2b7012c308c908fab8b8642e70929f02228b751e.tar.bz2 | |
am 087b25f7: am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo
Merge commit '087b25f7e2669497cf217d873437e8726c139abd' into kraken
* commit '087b25f7e2669497cf217d873437e8726c139abd':
Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
| -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 c9b649d..1816181 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)) { |