Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[DO NOT MERGE] Make extra navigation bar count towards non decor frame" into sc-v2-dev

Browse Source
This commit is contained in:
Yunfan Chen
2021-12-15 09:27:15 +00:00
committed by Android (Google) Code Review
parent 8833af1652 b356de42b0
commit b262f3b236
4 changed files with 114 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -2039,16 +2039,14 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
final DisplayCutout displayCutout = wmDisplayCutout.getDisplayCutout();
final RoundedCorners roundedCorners = calculateRoundedCornersForRotation(rotation);
final int appWidth = mDisplayPolicy.getNonDecorDisplayWidth(dw, dh, rotation, uiMode,
displayCutout);
final int appHeight = mDisplayPolicy.getNonDecorDisplayHeight(dw, dh, rotation, uiMode,
final Point appSize = mDisplayPolicy.getNonDecorDisplaySize(dw, dh, rotation, uiMode,
displayCutout);
mDisplayInfo.rotation = rotation;
mDisplayInfo.logicalWidth = dw;
mDisplayInfo.logicalHeight = dh;
mDisplayInfo.logicalDensityDpi = mBaseDisplayDensity;
mDisplayInfo.appWidth = appWidth;
mDisplayInfo.appHeight = appHeight;
mDisplayInfo.appWidth = appSize.x;
mDisplayInfo.appHeight = appSize.y;
if (isDefaultDisplay) {
mDisplayInfo.getLogicalMetrics(mRealDisplayMetrics,
CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO, null);
@@ -2177,24 +2175,22 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
/** Compute configuration related to application without changing current display. */
private void computeScreenAppConfiguration(Configuration outConfig, int dw, int dh,
int rotation, int uiMode, DisplayCutout displayCutout) {
final int appWidth = mDisplayPolicy.getNonDecorDisplayWidth(dw, dh, rotation, uiMode,
displayCutout);
final int appHeight = mDisplayPolicy.getNonDecorDisplayHeight(dw, dh, rotation, uiMode,
final Point appSize = mDisplayPolicy.getNonDecorDisplaySize(dw, dh, rotation, uiMode,
displayCutout);
mDisplayPolicy.getNonDecorInsetsLw(rotation, dw, dh, displayCutout, mTmpRect);
final int leftInset = mTmpRect.left;
final int topInset = mTmpRect.top;
// AppBounds at the root level should mirror the app screen size.
outConfig.windowConfiguration.setAppBounds(leftInset /* left */, topInset /* top */,
leftInset + appWidth /* right */, topInset + appHeight /* bottom */);
leftInset + appSize.x /* right */, topInset + appSize.y /* bottom */);
outConfig.windowConfiguration.setRotation(rotation);
outConfig.orientation = (dw <= dh) ? ORIENTATION_PORTRAIT : ORIENTATION_LANDSCAPE;
final float density = mDisplayMetrics.density;
outConfig.screenWidthDp = (int) (mDisplayPolicy.getConfigDisplayWidth(dw, dh, rotation,
uiMode, displayCutout) / density);
outConfig.screenHeightDp = (int) (mDisplayPolicy.getConfigDisplayHeight(dw, dh, rotation,
uiMode, displayCutout) / density);
final Point configSize = mDisplayPolicy.getConfigDisplaySize(dw, dh, rotation, uiMode,
displayCutout);
outConfig.screenWidthDp = (int) (configSize.x / density);
outConfig.screenHeightDp = (int) (configSize.y / density);
outConfig.compatScreenWidthDp = (int) (outConfig.screenWidthDp / mCompatibleScreenScale);
outConfig.compatScreenHeightDp = (int) (outConfig.screenHeightDp / mCompatibleScreenScale);
@@ -2333,10 +2329,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
DisplayMetrics dm, int dw, int dh) {
final DisplayCutout displayCutout = calculateDisplayCutoutForRotation(
rotation).getDisplayCutout();
dm.noncompatWidthPixels = mDisplayPolicy.getNonDecorDisplayWidth(dw, dh, rotation, uiMode,
displayCutout);
dm.noncompatHeightPixels = mDisplayPolicy.getNonDecorDisplayHeight(dw, dh, rotation, uiMode,
final Point nonDecorSize = mDisplayPolicy.getNonDecorDisplaySize(dw, dh, rotation, uiMode,
displayCutout);
dm.noncompatWidthPixels = nonDecorSize.x;
dm.noncompatHeightPixels = nonDecorSize.y;
float scale = CompatibilityInfo.computeCompatibleScaling(dm, null);
int size = (int)(((dm.noncompatWidthPixels / scale) / dm.density) + .5f);
if (curSize == 0 || size < curSize) {
@@ -2388,12 +2384,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
rotation).getDisplayCutout();
// Get the app screen size at this rotation.
int w = mDisplayPolicy.getNonDecorDisplayWidth(dw, dh, rotation, uiMode, displayCutout);
int h = mDisplayPolicy.getNonDecorDisplayHeight(dw, dh, rotation, uiMode, displayCutout);
final Point size = mDisplayPolicy.getNonDecorDisplaySize(dw, dh, rotation, uiMode,
displayCutout);
// Compute the screen layout size class for this rotation.
int longSize = w;
int shortSize = h;
int longSize = size.x;
int shortSize = size.y;
if (longSize < shortSize) {
int tmp = longSize;
longSize = shortSize;
@@ -2408,21 +2404,19 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
int uiMode, int dw, int dh) {
final DisplayCutout displayCutout = calculateDisplayCutoutForRotation(
rotation).getDisplayCutout();
final int width = mDisplayPolicy.getConfigDisplayWidth(dw, dh, rotation, uiMode,
final Point size = mDisplayPolicy.getConfigDisplaySize(dw, dh, rotation, uiMode,
displayCutout);
if (width < displayInfo.smallestNominalAppWidth) {
displayInfo.smallestNominalAppWidth = width;
if (size.x < displayInfo.smallestNominalAppWidth) {
displayInfo.smallestNominalAppWidth = size.x;
}
if (width > displayInfo.largestNominalAppWidth) {
displayInfo.largestNominalAppWidth = width;
if (size.x > displayInfo.largestNominalAppWidth) {
displayInfo.largestNominalAppWidth = size.x;
}
final int height = mDisplayPolicy.getConfigDisplayHeight(dw, dh, rotation, uiMode,
displayCutout);
if (height < displayInfo.smallestNominalAppHeight) {
displayInfo.smallestNominalAppHeight = height;
if (size.y < displayInfo.smallestNominalAppHeight) {
displayInfo.smallestNominalAppHeight = size.y;
}
if (height > displayInfo.largestNominalAppHeight) {
displayInfo.largestNominalAppHeight = height;
if (size.y > displayInfo.largestNominalAppHeight) {
displayInfo.largestNominalAppHeight = size.y;
}
}

120
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -121,6 +121,7 @@ import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.Insets;
import android.graphics.PixelFormat;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Region;
import android.gui.DropInputMode;
@@ -2325,6 +2326,24 @@ public class DisplayPolicy {
}
}
private int getAltBarWidth(@InternalInsetsType int insetsType) {
final InsetsSource source = mDisplayContent.getInsetsStateController().getRawInsetsState()
.peekSource(insetsType);
if (source == null) {
return 0;
}
return source.getFrame().width();
}
private int getAltBarHeight(@InternalInsetsType int insetsType) {
final InsetsSource source = mDisplayContent.getInsetsStateController().getRawInsetsState()
.peekSource(insetsType);
if (source == null) {
return 0;
}
return source.getFrame().height();
}
void notifyDisplayReady() {
mHandler.post(() -> {
final int displayId = getDisplayId();
@@ -2340,26 +2359,6 @@ public class DisplayPolicy {
});
}
/**
* Return the display width available after excluding any screen
* decorations that could never be removed in Honeycomb. That is, system bar or
* button bar.
*/
public int getNonDecorDisplayWidth(int fullWidth, int fullHeight, int rotation, int uiMode,
DisplayCutout displayCutout) {
int width = fullWidth;
if (hasNavigationBar()) {
final int navBarPosition = navigationBarPosition(fullWidth, fullHeight, rotation);
if (navBarPosition == NAV_BAR_LEFT || navBarPosition == NAV_BAR_RIGHT) {
width -= getNavigationBarWidth(rotation, uiMode, navBarPosition);
}
}
if (displayCutout != null) {
width -= displayCutout.getSafeInsetLeft() + displayCutout.getSafeInsetRight();
}
return width;
}
private int getNavigationBarHeight(int rotation, int uiMode) {
if (INSETS_LAYOUT_GENERALIZATION) {
if (mNavigationBar == null) {
@@ -2407,43 +2406,59 @@ public class DisplayPolicy {
}
/**
* Return the display height available after excluding any screen
* Return the display size available after excluding any screen
* decorations that could never be removed in Honeycomb. That is, system bar or
* button bar.
*/
public int getNonDecorDisplayHeight(int fullWidth, int fullHeight, int rotation, int uiMode,
Point getNonDecorDisplaySize(int fullWidth, int fullHeight, int rotation, int uiMode,
DisplayCutout displayCutout) {
int width = fullWidth;
int height = fullHeight;
int navBarReducedHeight = 0;
int navBarReducedWidth = 0;
final int navBarPosition = navigationBarPosition(fullWidth, fullHeight, rotation);
if (hasNavigationBar()) {
final int navBarPosition = navigationBarPosition(fullWidth, fullHeight, rotation);
if (navBarPosition == NAV_BAR_BOTTOM) {
height -= getNavigationBarHeight(rotation, uiMode);
navBarReducedHeight = getNavigationBarHeight(rotation, uiMode);
} else if (navBarPosition == NAV_BAR_LEFT || navBarPosition == NAV_BAR_RIGHT) {
navBarReducedWidth = getNavigationBarWidth(rotation, uiMode, navBarPosition);
}
}
if (mExtraNavBarAlt != null) {
final LayoutParams altBarParams = mExtraNavBarAlt.getLayoutingAttrs(rotation);
final int altBarPosition = getAltBarPosition(altBarParams);
if (altBarPosition == ALT_BAR_BOTTOM || altBarPosition == ALT_BAR_TOP) {
if (altBarPosition == navBarPosition) {
navBarReducedHeight = Math.max(navBarReducedHeight,
getAltBarHeight(ITYPE_EXTRA_NAVIGATION_BAR));
} else {
navBarReducedHeight += getAltBarHeight(ITYPE_EXTRA_NAVIGATION_BAR);
}
} else if (altBarPosition == ALT_BAR_LEFT || altBarPosition == ALT_BAR_RIGHT) {
if (altBarPosition == navBarPosition) {
navBarReducedWidth = Math.max(navBarReducedWidth,
getAltBarWidth(ITYPE_EXTRA_NAVIGATION_BAR));
} else {
navBarReducedWidth += getAltBarWidth(ITYPE_EXTRA_NAVIGATION_BAR);
}
}
}
height -= navBarReducedHeight;
width -= navBarReducedWidth;
if (displayCutout != null) {
height -= displayCutout.getSafeInsetTop() + displayCutout.getSafeInsetBottom();
width -= displayCutout.getSafeInsetLeft() + displayCutout.getSafeInsetRight();
}
return height;
return new Point(width, height);
}
/**
* Return the available screen width that we should report for the
* Return the available screen size that we should report for the
* configuration. This must be no larger than
* {@link #getNonDecorDisplayWidth(int, int, int, int, DisplayCutout)}; it may be smaller
* {@link #getNonDecorDisplaySize(int, int, int, int, DisplayCutout)}; it may be smaller
* than that to account for more transient decoration like a status bar.
*/
public int getConfigDisplayWidth(int fullWidth, int fullHeight, int rotation, int uiMode,
DisplayCutout displayCutout) {
return getNonDecorDisplayWidth(fullWidth, fullHeight, rotation, uiMode, displayCutout);
}
/**
* Return the available screen height that we should report for the
* configuration. This must be no larger than
* {@link #getNonDecorDisplayHeight(int, int, int, int, DisplayCutout)}; it may be smaller
* than that to account for more transient decoration like a status bar.
*/
public int getConfigDisplayHeight(int fullWidth, int fullHeight, int rotation, int uiMode,
Point getConfigDisplaySize(int fullWidth, int fullHeight, int rotation, int uiMode,
DisplayCutout displayCutout) {
// There is a separate status bar at the top of the display. We don't count that as part
// of the fixed decor, since it can hide; however, for purposes of configurations,
@@ -2455,8 +2470,9 @@ public class DisplayPolicy {
// bar height.
statusBarHeight = Math.max(0, statusBarHeight - displayCutout.getSafeInsetTop());
}
return getNonDecorDisplayHeight(fullWidth, fullHeight, rotation, uiMode, displayCutout)
- statusBarHeight;
final Point nonDecorSize = getNonDecorDisplaySize(fullWidth, fullHeight, rotation,
uiMode, displayCutout);
return new Point(nonDecorSize.x, nonDecorSize.y - statusBarHeight);
}
/**
@@ -2504,7 +2520,7 @@ public class DisplayPolicy {
/**
* Calculates the insets for the areas that could never be removed in Honeycomb, i.e. system
* bar or button bar. See {@link #getNonDecorDisplayWidth}.
* bar or button bar. See {@link #getNonDecorDisplaySize}.
*
* @param displayRotation the current display rotation
* @param displayWidth the current display width
@@ -2516,7 +2532,7 @@ public class DisplayPolicy {
DisplayCutout displayCutout, Rect outInsets) {
outInsets.setEmpty();
// Only navigation bar
// Only navigation bar and extra navigation bar
if (hasNavigationBar()) {
final int uiMode = mService.mPolicy.getUiMode();
int position = navigationBarPosition(displayWidth, displayHeight, displayRotation);
@@ -2528,6 +2544,24 @@ public class DisplayPolicy {
outInsets.left = getNavigationBarWidth(displayRotation, uiMode, position);
}
}
if (mExtraNavBarAlt != null) {
final LayoutParams extraNavLayoutParams =
mExtraNavBarAlt.getLayoutingAttrs(displayRotation);
final int position = getAltBarPosition(extraNavLayoutParams);
if (position == ALT_BAR_BOTTOM) {
outInsets.bottom = Math.max(outInsets.bottom,
getAltBarHeight(ITYPE_EXTRA_NAVIGATION_BAR));
} else if (position == ALT_BAR_RIGHT) {
outInsets.right = Math.max(outInsets.right,
getAltBarWidth(ITYPE_EXTRA_NAVIGATION_BAR));
} else if (position == ALT_BAR_LEFT) {
outInsets.left = Math.max(outInsets.left,
getAltBarWidth(ITYPE_EXTRA_NAVIGATION_BAR));
} else if (position == ALT_BAR_TOP) {
outInsets.top = Math.max(outInsets.top,
getAltBarHeight(ITYPE_EXTRA_NAVIGATION_BAR));
}
}
if (displayCutout != null) {
outInsets.left += displayCutout.getSafeInsetLeft();

7
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -6171,9 +6171,10 @@ public class WindowManagerService extends IWindowManager.Stub
+ " callers=" + Debug.getCallers(3));
return NAV_BAR_INVALID;
}
displayContent.performLayout(false /* initial */,
false /* updateInputWindows */);
return displayContent.getDisplayPolicy().getNavBarPosition();
return displayContent.getDisplayPolicy().navigationBarPosition(
displayContent.mBaseDisplayWidth,
displayContent.mBaseDisplayHeight,
displayContent.getDisplayRotation().getRotation());
}
}

16
services/tests/wmtests/src/com/android/server/wm/DisplayPolicyInsetsTests.java
View File

@@ -180,23 +180,23 @@ public class DisplayPolicyInsetsTests extends DisplayPolicyTestsBase {
}
private int getNonDecorDisplayWidth(DisplayInfo di) {
return mDisplayPolicy.getNonDecorDisplayWidth(di.logicalWidth, di.logicalHeight,
di.rotation, 0 /* ui */, di.displayCutout);
return mDisplayPolicy.getNonDecorDisplaySize(di.logicalWidth, di.logicalHeight,
di.rotation, 0 /* ui */, di.displayCutout).x;
}
private int getNonDecorDisplayHeight(DisplayInfo di) {
return mDisplayPolicy.getNonDecorDisplayHeight(di.logicalWidth, di.logicalHeight,
di.rotation, 0 /* ui */, di.displayCutout);
return mDisplayPolicy.getNonDecorDisplaySize(di.logicalWidth, di.logicalHeight,
di.rotation, 0 /* ui */, di.displayCutout).y;
}
private int getConfigDisplayWidth(DisplayInfo di) {
return mDisplayPolicy.getConfigDisplayWidth(di.logicalWidth, di.logicalHeight,
di.rotation, 0 /* ui */, di.displayCutout);
return mDisplayPolicy.getConfigDisplaySize(di.logicalWidth, di.logicalHeight,
di.rotation, 0 /* ui */, di.displayCutout).x;
}
private int getConfigDisplayHeight(DisplayInfo di) {
return mDisplayPolicy.getConfigDisplayHeight(di.logicalWidth, di.logicalHeight,
di.rotation, 0 /* ui */, di.displayCutout);
return mDisplayPolicy.getConfigDisplaySize(di.logicalWidth, di.logicalHeight,
di.rotation, 0 /* ui */, di.displayCutout).y;
}
private static DisplayInfo displayInfoForRotation(int rotation, boolean withDisplayCutout) {