diff options
2 files changed, 9 insertions, 5 deletions
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplier.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplier.java index 1c2831bd13f8..9f7d0b213a35 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplier.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplier.java @@ -70,6 +70,9 @@ public class SyncRtSurfaceTransactionApplier { t.setEarlyWakeup(); t.apply(); }); + + // Make sure a frame gets scheduled. + mTargetViewRootImpl.getView().invalidate(); } public static class SurfaceParams { @@ -83,9 +86,9 @@ public class SyncRtSurfaceTransactionApplier { * @param matrix Matrix to apply. * @param windowCrop Crop to apply. */ - public SurfaceParams(SurfaceControl surface, float alpha, Matrix matrix, Rect windowCrop, - int layer) { - this.surface = surface; + public SurfaceParams(SurfaceControlCompat surface, float alpha, Matrix matrix, + Rect windowCrop, int layer) { + this.surface = surface.mSurfaceControl; this.alpha = alpha; this.matrix = new Matrix(matrix); this.windowCrop = new Rect(windowCrop); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java index a4039fb47232..a68d75a54f7b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java @@ -30,6 +30,7 @@ import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationTarget; import com.android.systemui.Interpolators; +import com.android.systemui.shared.system.SurfaceControlCompat; import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier; import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier.SurfaceParams; import com.android.systemui.statusbar.ExpandableNotificationRow; @@ -245,8 +246,8 @@ public class ActivityLaunchAnimator { Matrix m = new Matrix(); m.postTranslate(0, (float) (mParams.top - app.position.y)); mWindowCrop.set(mParams.left, 0, mParams.right, mParams.getHeight()); - SurfaceParams params = new SurfaceParams(app.leash, 1f /* alpha */, m, mWindowCrop, - app.prefixOrderIndex); + SurfaceParams params = new SurfaceParams(new SurfaceControlCompat(app.leash), + 1f /* alpha */, m, mWindowCrop, app.prefixOrderIndex); mSyncRtTransactionApplier.scheduleApply(params); } |