Merge "Get correct insets of the phone screen at boot"

This commit is contained in:
TreeHugger Robot
2016-12-15 01:36:38 +00:00
committed by Android (Google) Code Review

View File

@@ -6685,9 +6685,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// Navigation bar and status bar.
getNonDecorInsetsLw(displayRotation, displayWidth, displayHeight, outInsets);
if (mStatusBar != null) {
outInsets.top = mStatusBarHeight;
}
outInsets.top = mStatusBarHeight;
}
@Override
@@ -6696,7 +6694,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
outInsets.setEmpty();
// Only navigation bar
if (mNavigationBar != null) {
if (mHasNavigationBar) {
int position = navigationBarPosition(displayWidth, displayHeight, displayRotation);
if (position == NAV_BAR_BOTTOM) {
outInsets.bottom = getNavigationBarHeight(displayRotation, mUiMode);