Merge changes from topics "taskbar-search-back", "taskbar-search-transition" into udc-qpr-dev am: 5cc62b13ee am: a1a2b6beed

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24024257

Change-Id: I59dd013a9b1561c3e51bf4f32cee579b4768afa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java

@@ -214,4 +214,11 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverla
     protected boolean isEventOverContent(MotionEvent ev) {
         return getPopupContainer().isEventOverView(mAppsView.getVisibleContainerView(), ev);
     }
+
+    @Override
+    public void onBackInvoked() {
+        if (!mAllAppsCallbacks.handleSearchBackInvoked()) {
+            super.onBackInvoked();
+        }
+    }
 }

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java

@@ -120,5 +120,10 @@ final class TaskbarAllAppsViewController {
         public void onAllAppsTransitionEnd(boolean toAllApps) {
             mSearchSessionController.onAllAppsTransitionEnd(toAllApps);
         }
+
+        /** Invoked on back press, returning {@code true} if the search session handled it. */
+        boolean handleSearchBackInvoked() {
+            return mSearchSessionController.handleBackInvoked();
+        }
     }
 }

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarSearchSessionController.kt

@@ -48,6 +48,8 @@ open class TaskbarSearchSessionController : ResourceBasedOverride, AllAppsTransi
     /** Creates a [PreDragCondition] for [view], if it is a search result that requires one. */
     open fun createPreDragConditionForSearch(view: View): PreDragCondition? = null
 
+    open fun handleBackInvoked(): Boolean = false
+
     companion object {
         @JvmStatic
         fun newInstance(context: Context): TaskbarSearchSessionController {