From 97ae16e80c54d5935c63803d9945b40a813c84db Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 24 Oct 2022 15:49:27 -0700
Subject: [PATCH] Updating AIDL interface and removing unused methods

Bug: 193244407
Test: Presubmit
Change-Id: If87ef08e16e541921cde4e7a15a675b07c388fef
---
 .../com/android/quickstep/AbsSwipeUpHandler.java   |  1 -
 .../src/com/android/quickstep/SystemUiProxy.java   | 11 -----------
 .../android/quickstep/TouchInteractionService.java | 14 ++++----------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 267593a2e7..df08596c5a 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -951,7 +951,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                 new ActiveGestureLog.CompoundString("on gesture started (animate=false)"));
         mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
         mGestureStarted = true;
-        SystemUiProxy.INSTANCE.get(mContext).notifySwipeUpGestureStarted();
     }
 
     /**
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 7705a2512a..256e68992c 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -346,17 +346,6 @@ public class SystemUiProxy implements ISystemUiProxy {
         }
     }
 
-    @Override
-    public void notifySwipeUpGestureStarted() {
-        if (mSystemUiProxy != null) {
-            try {
-                mSystemUiProxy.notifySwipeUpGestureStarted();
-            } catch (RemoteException e) {
-                Log.w(TAG, "Failed call notifySwipeUpGestureStarted", e);
-            }
-        }
-    }
-
     @Override
     public void notifyPrioritizedRotation(int rotation) {
         if (mSystemUiProxy != null) {
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 80db362b09..239b3fc70f 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -60,6 +60,7 @@ import android.util.Log;
 import android.view.Choreographer;
 import android.view.InputEvent;
 import android.view.MotionEvent;
+import android.view.SurfaceControl;
 import android.view.accessibility.AccessibilityManager;
 
 import androidx.annotation.BinderThread;
@@ -230,12 +231,6 @@ public class TouchInteractionService extends Service
             }
         }
 
-        @BinderThread
-        @Override
-        public void onTip(int actionType, int viewType) {
-            // Please delete this method from the interface
-        }
-
         @BinderThread
         @Override
         public void onAssistantAvailable(boolean available) {
@@ -254,10 +249,9 @@ public class TouchInteractionService extends Service
             });
         }
 
-        @BinderThread
-        public void onBackAction(boolean completed, int downX, int downY, boolean isButton,
-                boolean gestureSwipeLeft) {
-            // Remove this method from the interface
+        @Override
+        public void onNavigationBarSurface(SurfaceControl surface) {
+            // TODO: implement
         }
 
         @BinderThread