From 1c21fcf2483db5a4640ea5b2cd14534f1afa923f Mon Sep 17 00:00:00 2001
From: Shan Huang <shanh@google.com>
Date: Fri, 10 Mar 2023 14:23:14 -0800
Subject: [PATCH] Dispatch animation callbacks by default.

Bug: 269781808
Test: atest OnBackInvokedCallbackGestureTest
Test: Make sure opted-in apps receive progress events even when dev
option is off

Change-Id: I4536af7a5606012639bcd6d70e0ccdd7c945fda1
---
 .../shell/back/BackAnimationController.java   | 20 ++++---------------
 .../back/BackAnimationControllerTest.java     |  2 --
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
index 349ff36ce8ced..6f993aebdc65a 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
@@ -384,8 +384,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
     }
 
     private void onMove() {
-        if (!mBackGestureStarted || mBackNavigationInfo == null || !mEnableAnimations.get()
-                || mActiveCallback == null) {
+        if (!mBackGestureStarted || mBackNavigationInfo == null || mActiveCallback == null) {
             return;
         }
 
@@ -424,9 +423,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
             return;
         }
         try {
-            if (mEnableAnimations.get()) {
-                callback.onBackStarted(backEvent);
-            }
+            callback.onBackStarted(backEvent);
         } catch (RemoteException e) {
             Log.e(TAG, "dispatchOnBackStarted error: ", e);
         }
@@ -448,9 +445,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
             return;
         }
         try {
-            if (mEnableAnimations.get()) {
-                callback.onBackCancelled();
-            }
+            callback.onBackCancelled();
         } catch (RemoteException e) {
             Log.e(TAG, "dispatchOnBackCancelled error: ", e);
         }
@@ -462,19 +457,12 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
             return;
         }
         try {
-            if (mEnableAnimations.get()) {
-                callback.onBackProgressed(backEvent);
-            }
+            callback.onBackProgressed(backEvent);
         } catch (RemoteException e) {
             Log.e(TAG, "dispatchOnBackProgressed error: ", e);
         }
     }
 
-    private boolean shouldDispatchAnimation(IOnBackInvokedCallback callback) {
-        // TODO(b/258698745): Only dispatch to animation callbacks.
-        return mEnableAnimations.get();
-    }
-
     /**
      * Sets to true when the back gesture has passed the triggering threshold, false otherwise.
      */
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
index 169b9bd4dea72..806bffebd4cb9 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
@@ -253,8 +253,6 @@ public class BackAnimationControllerTest extends ShellTestCase {
 
         triggerBackGesture();
 
-        verify(mAppCallback, never()).onBackStarted(any());
-        verify(mAppCallback, never()).onBackProgressed(backEventCaptor.capture());
         verify(mAppCallback, times(1)).onBackInvoked();
 
         verify(mAnimatorCallback, never()).onBackStarted(any());