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

Merge "Scale PiP to stack instead of crop."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-01 23:14:12 +00:00
committed by Android (Google) Code Review
parent 0c430fa464 fd4c9891f3
commit 655ce66be5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/TaskStack.java
View File

@@ -1479,7 +1479,7 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye
return StackId.hasMovementAnimations(mStackId);
}
public boolean getForceScaleToCrop() {
public boolean getForceScaleToStack() {
return mBoundsAnimating;
}

10
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -1313,18 +1313,20 @@ class WindowStateAnimator {
float surfaceWidth = mSurfaceController.getWidth();
float surfaceHeight = mSurfaceController.getHeight();
if ((task != null && task.mStack.getForceScaleToCrop()) || mForceScaleUntilResize) {
if ((task != null && task.mStack.getForceScaleToStack()) || mForceScaleUntilResize) {
int hInsets = w.getAttrs().surfaceInsets.left + w.getAttrs().surfaceInsets.right;
int vInsets = w.getAttrs().surfaceInsets.top + w.getAttrs().surfaceInsets.bottom;
if (!mForceScaleUntilResize) {
mSurfaceController.forceScaleableInTransaction(true);
}
task.mStack.getDimBounds(mTmpStackBounds);
// We want to calculate the scaling based on the content area, not based on
// the entire surface, so that we scale in sync with windows that don't have insets.
mExtraHScale = (finalClipRect.width() - hInsets) / (float)(surfaceWidth - hInsets);
mExtraVScale = (finalClipRect.height() - vInsets) / (float)(surfaceHeight - vInsets);
mExtraHScale = (mTmpStackBounds.width() - hInsets) / (float)(surfaceWidth - hInsets);
mExtraVScale = (mTmpStackBounds.height() - vInsets) / (float)(surfaceHeight - vInsets);
// In the case of ForceScaleToCrop we scale entire tasks together,
// In the case of ForceScaleToStack we scale entire tasks together,
// and so we need to scale our offsets relative to the task bounds
// or parent and child windows would fall out of alignment.
int posX = (int) (mTmpSize.left - w.mAttrs.x * (1 - mExtraHScale));