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

Merge "Fix race between AnimationListener and DragState"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-28 02:03:52 +00:00
committed by Android (Google) Code Review
parent 593f56cc81 971fe912c7
commit 352be20d06
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -645,15 +645,15 @@ class DragState {
try (final SurfaceControl.Transaction transaction = new SurfaceControl.Transaction()) {
transaction.setPosition(
mSurfaceControl,
(float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_X),
(float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_Y));
(float) animation.getAnimatedValue(ANIMATED_PROPERTY_X),
(float) animation.getAnimatedValue(ANIMATED_PROPERTY_Y));
transaction.setAlpha(
mSurfaceControl,
(float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_ALPHA));
(float) animation.getAnimatedValue(ANIMATED_PROPERTY_ALPHA));
transaction.setMatrix(
mSurfaceControl,
(float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_SCALE), 0,
0, (float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_SCALE));
(float) animation.getAnimatedValue(ANIMATED_PROPERTY_SCALE), 0,
0, (float) animation.getAnimatedValue(ANIMATED_PROPERTY_SCALE));
transaction.apply();
}
}