From ec537457cd2869e52b9b2c99e8c01dd96a9682e2 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 14 Sep 2011 19:19:55 -0700 Subject: Fix issue #5155678: Portrait > Landscape full-screen transition... ...mode cuts off screen rendering The code for limiting application window sizes to not include the navigation bar was dead. Now it is back. Change-Id: Ic0bde56e3300fd0d9d225e19d8de2766d07e8780 --- .../internal/policy/impl/PhoneWindowManager.java | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'policy') diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 29a9ad4..10447ad 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1724,6 +1724,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { displayWidth, displayHeight); if (mNavigationBar.isVisibleLw()) { mDockBottom = mTmpNavigationFrame.top; + mRestrictedScreenHeight = mDockBottom - mDockTop; } } else { // Landscape screen; nav bar goes to the right. @@ -1731,6 +1732,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { displayWidth, displayHeight); if (mNavigationBar.isVisibleLw()) { mDockRight = mTmpNavigationFrame.left; + mRestrictedScreenWidth = mDockRight - mDockLeft; } } mNavigationBar.computeFrameLw(mTmpNavigationFrame, mTmpNavigationFrame, @@ -1748,25 +1750,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { mStatusBar.computeFrameLw(pf, df, vf, vf); - // now, let's consider the navigation bar; if it exists, it must be removed from the - // available screen real estate (like an un-hideable status bar) - if (navr != null) { - if (navr.top == 0) { - // Navigation bar is vertical - if (mRestrictedScreenLeft == navr.left) { - mRestrictedScreenLeft = navr.right; - mRestrictedScreenWidth -= (navr.right - navr.left); - } else if ((mRestrictedScreenLeft+mRestrictedScreenWidth) == navr.right) { - mRestrictedScreenWidth -= (navr.right - navr.left); - } - } else { - // Navigation bar horizontal, at bottom - if ((mRestrictedScreenHeight+mRestrictedScreenTop) == navr.bottom) { - mRestrictedScreenHeight -= (navr.bottom-navr.top); - } - } - } - if (mStatusBar.isVisibleLw()) { // If the status bar is hidden, we don't want to cause // windows behind it to scroll. -- cgit v1.1