diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-03 14:15:10 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-06-03 14:15:10 -0700 |
| commit | 678d344bcb5c7981b5033cdf8070c58783ded01b (patch) | |
| tree | b440fe73861eeaedacaf20e43e21f9a1c13bdd64 /packages | |
| parent | 3c784fe6a04b198963cdbd9a2a970b9312289533 (diff) | |
| parent | b9e2f68b2865307db25fa7295b7ba3bd51c7521a (diff) | |
| download | frameworks_base-678d344bcb5c7981b5033cdf8070c58783ded01b.zip frameworks_base-678d344bcb5c7981b5033cdf8070c58783ded01b.tar.gz frameworks_base-678d344bcb5c7981b5033cdf8070c58783ded01b.tar.bz2 | |
resolved conflicts for merge of b9e2f68b to master
Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index 0aaf5e5..5b5801d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -309,7 +309,7 @@ public class TabletStatusBar extends StatusBar implements final Resources res = mContext.getResources(); final Display d = WindowManagerImpl.getDefault().getDefaultDisplay(); return Math.max(res.getDimensionPixelSize(R.dimen.notification_panel_min_height), - d.getHeight()); + d.getRealHeight()); } @Override |