diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/policy/BackdropFrameRenderer.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/policy/DecorView.java | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/core/java/com/android/internal/policy/BackdropFrameRenderer.java b/core/java/com/android/internal/policy/BackdropFrameRenderer.java index fa737582f7f6..7bfed91c42b9 100644 --- a/core/java/com/android/internal/policy/BackdropFrameRenderer.java +++ b/core/java/com/android/internal/policy/BackdropFrameRenderer.java @@ -380,7 +380,7 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame // don't want the navigation bar background be moving around when resizing in docked mode. // However, we need it for the transitions into/out of docked mode. if (mNavigationBarColor != null && fullscreen) { - DecorView.getNavigationBarRect(width, height, stableInsets, systemInsets, mTmpRect); + DecorView.getNavigationBarRect(width, height, stableInsets, systemInsets, mTmpRect, 1f); mNavigationBarColor.setBounds(mTmpRect); mNavigationBarColor.draw(canvas); } diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index 723f16128281..afe795497104 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -1080,10 +1080,13 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind } public static void getNavigationBarRect(int canvasWidth, int canvasHeight, Rect stableInsets, - Rect contentInsets, Rect outRect) { - final int bottomInset = getColorViewBottomInset(stableInsets.bottom, contentInsets.bottom); - final int leftInset = getColorViewLeftInset(stableInsets.left, contentInsets.left); - final int rightInset = getColorViewLeftInset(stableInsets.right, contentInsets.right); + Rect contentInsets, Rect outRect, float scale) { + final int bottomInset = + (int) (getColorViewBottomInset(stableInsets.bottom, contentInsets.bottom) * scale); + final int leftInset = + (int) (getColorViewLeftInset(stableInsets.left, contentInsets.left) * scale); + final int rightInset = + (int) (getColorViewLeftInset(stableInsets.right, contentInsets.right) * scale); final int size = getNavBarSize(bottomInset, rightInset, leftInset); if (isNavBarToRightEdge(bottomInset, rightInset)) { outRect.set(canvasWidth - size, 0, canvasWidth, canvasHeight); |