diff options
| author | Winson Chung <winsonc@google.com> | 2019-09-20 21:28:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-20 21:28:29 +0000 |
| commit | 95112612bb0094f50857fbfdf3e212b9a5e54a42 (patch) | |
| tree | 48cc3440b5d9841bc0b4c2ed892ff3ffa70c7d4f /core/java/android | |
| parent | 5d76d44153b13c41612fa9b7db1a839d660b329e (diff) | |
| parent | d585219545554c6672640cec8e7c7be5054f0693 (diff) | |
Merge "Add wallpaper leash for remote and recents animations"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/IRecentsAnimationRunner.aidl | 4 | ||||
| -rw-r--r-- | core/java/android/view/IRemoteAnimationRunner.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/view/SyncRtSurfaceTransactionApplier.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/view/IRecentsAnimationRunner.aidl b/core/java/android/view/IRecentsAnimationRunner.aidl index 724d96ed9585..6eb90fc54286 100644 --- a/core/java/android/view/IRecentsAnimationRunner.aidl +++ b/core/java/android/view/IRecentsAnimationRunner.aidl @@ -54,6 +54,6 @@ oneway interface IRecentsAnimationRunner { */ @UnsupportedAppUsage void onAnimationStart(in IRecentsAnimationController controller, - in RemoteAnimationTarget[] apps, in Rect homeContentInsets, - in Rect minimizedHomeBounds) = 2; + in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers, + in Rect homeContentInsets, in Rect minimizedHomeBounds) = 2; } diff --git a/core/java/android/view/IRemoteAnimationRunner.aidl b/core/java/android/view/IRemoteAnimationRunner.aidl index 73b023c99665..7b35aa2d2b45 100644 --- a/core/java/android/view/IRemoteAnimationRunner.aidl +++ b/core/java/android/view/IRemoteAnimationRunner.aidl @@ -34,7 +34,7 @@ oneway interface IRemoteAnimationRunner { * @param finishedCallback The callback to invoke when the animation is finished. */ @UnsupportedAppUsage - void onAnimationStart(in RemoteAnimationTarget[] apps, + void onAnimationStart(in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers, in IRemoteAnimationFinishedCallback finishedCallback); /** diff --git a/core/java/android/view/SyncRtSurfaceTransactionApplier.java b/core/java/android/view/SyncRtSurfaceTransactionApplier.java index 1b6c5752217e..a6536f5d83b7 100644 --- a/core/java/android/view/SyncRtSurfaceTransactionApplier.java +++ b/core/java/android/view/SyncRtSurfaceTransactionApplier.java @@ -255,7 +255,7 @@ public class SyncRtSurfaceTransactionApplier { this.surface = surface; this.alpha = alpha; this.matrix = new Matrix(matrix); - this.windowCrop = new Rect(windowCrop); + this.windowCrop = windowCrop != null ? new Rect(windowCrop) : null; this.layer = layer; this.cornerRadius = cornerRadius; this.visible = visible; |