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

Merge "Apply final crop during surface preservation" into nyc-dev

Browse Source 
am: 2d4d408a5b

* commit '2d4d408a5be45b027e43fee99cc3a44b6a556c66':
  Apply final crop during surface preservation

Change-Id: Ica109f6bffb84ad1dc182a366be2d1fd9a1d17f1
This commit is contained in:
Chong Zhang
2016-05-17 17:25:04 +00:00
committed by android-build-merger
parent efae6e9ff1 2d4d408a5b
commit a409fada63
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1298,6 +1298,9 @@ class WindowStateAnimator {
if (!finalClipRect.equals(mLastFinalClipRect)) {
mLastFinalClipRect.set(finalClipRect);
mSurfaceController.setFinalCropInTransaction(finalClipRect);
if (mDestroyPreservedSurfaceUponRedraw && mPendingDestroySurface != null) {
mPendingDestroySurface.setFinalCropInTransaction(finalClipRect);
}
}
}
@@ -1370,7 +1373,8 @@ class WindowStateAnimator {
// If we are animating, we either apply the clip before applying all the animation
// transformation or after all the transformation.
final boolean useFinalClipRect = isAnimationSet() && stackClip == STACK_CLIP_AFTER_ANIM;
final boolean useFinalClipRect = isAnimationSet() && stackClip == STACK_CLIP_AFTER_ANIM
|| mDestroyPreservedSurfaceUponRedraw;
// We need to do some acrobatics with surface position, because their clip region is
// relative to the inside of the surface, but the stack bounds aren't.