commit 5ad8cd2586cb384b364d32d42e9c543c6eca0191
author Adrian Roos <roosa@google.com> Thu Mar 12 18:30:54 2020 +0000
committer Adrian Roos <roosa@google.com> Fri Mar 13 19:40:34 2020 +0000
tree 78f76a0b0db7957397e25fbc33fbc83b574a06b4
parent a03b6abb5be607a0dfb3b913a21011863225af6e

Revert "Revert "WindowInsetsController: Address API feedback""

This reverts commit 5e7097b21ea3841550044b933238f273be7cf2b6
and relands Id4cb53fddcecac17b7926068046760df5130dc39

Change-Id: I348141f27efcf7c22736778fbcdde4a110e95982
Fixes: 150472709
Test: atest InsetsControllerTest

core/java/android/view/PendingInsetsController.java

diff --git a/core/java/android/view/PendingInsetsController.java b/core/java/android/view/PendingInsetsController.java
index 7f36418..e8d9bb5 100644
--- a/core/java/android/view/PendingInsetsController.java
+++ b/core/java/android/view/PendingInsetsController.java
@@ -16,6 +16,8 @@
 
 package android.view;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.os.CancellationSignal;
 import android.view.WindowInsets.Type.InsetsType;
 import android.view.animation.Interpolator;
@@ -60,21 +62,6 @@
     }
 
     @Override
-    public CancellationSignal controlWindowInsetsAnimation(int types, long durationMillis,
-            Interpolator interpolator,
-            WindowInsetsAnimationControlListener listener) {
-        if (mReplayedInsetsController != null) {
-            return mReplayedInsetsController.controlWindowInsetsAnimation(types, durationMillis,
-                    interpolator, listener);
-        } else {
-            listener.onCancelled();
-            CancellationSignal cancellationSignal = new CancellationSignal();
-            cancellationSignal.cancel();
-            return cancellationSignal;
-        }
-    }
-
-    @Override
     public void setSystemBarsAppearance(int appearance, int mask) {
         if (mReplayedInsetsController != null) {
             mReplayedInsetsController.setSystemBarsAppearance(appearance, mask);
@@ -176,6 +163,19 @@
         mReplayedInsetsController = null;
     }
 
+    @Override
+    public void controlWindowInsetsAnimation(@InsetsType int types, long durationMillis,
+            @Nullable Interpolator interpolator,
+            CancellationSignal cancellationSignal,
+            @NonNull WindowInsetsAnimationControlListener listener) {
+        if (mReplayedInsetsController != null) {
+            mReplayedInsetsController.controlWindowInsetsAnimation(types, durationMillis,
+                    interpolator, cancellationSignal, listener);
+        } else {
+            listener.onCancelled();
+        }
+    }
+
     private interface PendingRequest {
         void replay(InsetsController controller);
     }