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 /core/java | |
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 'core/java')
-rw-r--r-- | core/java/android/view/ViewAncestor.java | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/core/java/android/view/ViewAncestor.java b/core/java/android/view/ViewAncestor.java index bd33a6a..1e72529 100644 --- a/core/java/android/view/ViewAncestor.java +++ b/core/java/android/view/ViewAncestor.java @@ -765,10 +765,17 @@ public final class ViewAncestor extends Handler implements ViewParent, fullRedrawNeeded = true; mLayoutRequested = true; - DisplayMetrics packageMetrics = - mView.getContext().getResources().getDisplayMetrics(); - desiredWindowWidth = packageMetrics.widthPixels; - desiredWindowHeight = packageMetrics.heightPixels; + if (lp.type == WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL) { + // NOTE -- system code, won't try to do compat mode. + Display disp = WindowManagerImpl.getDefault().getDefaultDisplay(); + desiredWindowWidth = disp.getRealWidth(); + desiredWindowHeight = disp.getRealHeight(); + } else { + DisplayMetrics packageMetrics = + mView.getContext().getResources().getDisplayMetrics(); + desiredWindowWidth = packageMetrics.widthPixels; + desiredWindowHeight = packageMetrics.heightPixels; + } // For the very first time, tell the view hierarchy that it // is attached to the window. Note that at this point the surface @@ -912,9 +919,16 @@ public final class ViewAncestor extends Handler implements ViewParent, || lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) { windowSizeMayChange = true; - DisplayMetrics packageMetrics = res.getDisplayMetrics(); - desiredWindowWidth = packageMetrics.widthPixels; - desiredWindowHeight = packageMetrics.heightPixels; + if (lp.type == WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL) { + // NOTE -- system code, won't try to do compat mode. + Display disp = WindowManagerImpl.getDefault().getDefaultDisplay(); + desiredWindowWidth = disp.getRealWidth(); + desiredWindowHeight = disp.getRealHeight(); + } else { + DisplayMetrics packageMetrics = res.getDisplayMetrics(); + desiredWindowWidth = packageMetrics.widthPixels; + desiredWindowHeight = packageMetrics.heightPixels; + } } } |