Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev

This commit is contained in:
Tiger Huang
2018-06-01 07:49:56 +00:00
committed by Android (Google) Code Review

View File

@@ -5761,11 +5761,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mStatusBarController.updateVisibilityLw(false /*transientAllowed*/, mStatusBarController.updateVisibilityLw(false /*transientAllowed*/,
mLastSystemUiFlags, mLastSystemUiFlags); mLastSystemUiFlags, mLastSystemUiFlags);
} }
if (statusBarExpanded && mNavigationBar != null) {
if (mNavigationBarController.setBarShowingLw(true)) {
changes |= FINISH_LAYOUT_REDO_LAYOUT;
}
}
} else if (mTopFullscreenOpaqueWindowState != null) { } else if (mTopFullscreenOpaqueWindowState != null) {
topIsFullscreen = topAppHidesStatusBar; topIsFullscreen = topAppHidesStatusBar;
// The subtle difference between the window for mTopFullscreenOpaqueWindowState // The subtle difference between the window for mTopFullscreenOpaqueWindowState