diff options
author | Glenn Kasten <gkasten@google.com> | 2011-05-03 16:57:45 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-03 16:57:45 -0700 |
commit | 3b698d181b7f165c9b31f7d74be19a5ed7575347 (patch) | |
tree | 1caf3ddd84c964b7210b477c6a829ae112dab80d /packages | |
parent | 3ed0a1ec7aa6364c236721a1bd29fd196f259cba (diff) | |
parent | 9d8c6215d1aedb1e9f2e10c63e737427f13be884 (diff) | |
download | frameworks_base-3b698d181b7f165c9b31f7d74be19a5ed7575347.zip frameworks_base-3b698d181b7f165c9b31f7d74be19a5ed7575347.tar.gz frameworks_base-3b698d181b7f165c9b31f7d74be19a5ed7575347.tar.bz2 |
am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
* commit '9d8c6215d1aedb1e9f2e10c63e737427f13be884':
Account for race condition when attaching HDMI.
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/HeightReceiver.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HeightReceiver.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HeightReceiver.java index 90c9568..9924faa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HeightReceiver.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/HeightReceiver.java @@ -77,7 +77,9 @@ public class HeightReceiver extends BroadcastReceiver { if (plugged) { final DisplayMetrics metrics = new DisplayMetrics(); mWindowManager.getDefaultDisplay().getMetrics(metrics); - height = metrics.heightPixels - 720; + //Slog.i(TAG, "setPlugged: display metrics=" + metrics); + final int shortSide = Math.min(metrics.widthPixels, metrics.heightPixels); + height = shortSide - 720; } final int minHeight |