Merge "Fix dock rect calculation when nav is translucent." into klp-dev (8ca2d052) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -2737,7 +2737,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		- mNavigationBarHeightForRotation[displayRotation];
		mTmpNavigationFrame.set(0, top, displayWidth, displayHeight - overscanBottom);
		mStableBottom = mStableFullscreenBottom = mTmpNavigationFrame.top;
		if (transientNavBarShowing \|\| navTranslucent) {
		if (transientNavBarShowing) {
		mNavigationBarController.setBarShowingLw(true);
		} else if (navVisible) {
		mNavigationBarController.setBarShowingLw(true);
		@@ -2761,7 +2761,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		- mNavigationBarWidthForRotation[displayRotation];
		mTmpNavigationFrame.set(left, 0, displayWidth - overscanRight, displayHeight);
		mStableRight = mStableFullscreenRight = mTmpNavigationFrame.left;
		if (transientNavBarShowing \|\| navTranslucent) {
		if (transientNavBarShowing) {
		mNavigationBarController.setBarShowingLw(true);
		} else if (navVisible) {
		mNavigationBarController.setBarShowingLw(true);
		@@ -3074,8 +3074,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		+ mOverscanScreenHeight;
		} else if (canHideNavigationBar()
		&& (sysUiFl & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0
		&& attrs.type >= WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW
		&& attrs.type <= WindowManager.LayoutParams.LAST_SUB_WINDOW) {
		&& (attrs.type == WindowManager.LayoutParams.TYPE_KEYGUARD \|\| (
		attrs.type >= WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW
		&& attrs.type <= WindowManager.LayoutParams.LAST_SUB_WINDOW))) {
		// Asking for layout as if the nav bar is hidden, lets the
		// application extend into the unrestricted overscan screen area. We
		// only do this for application windows to ensure no window that