diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java index 3e1fef91e8..544f9bf27e 100644 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java @@ -164,7 +164,7 @@ public final class TaskbarAllAppsController { cleanUpOverlay(); }); TaskbarAllAppsViewController viewController = new TaskbarAllAppsViewController( - mOverlayContext, mSlideInView, mControllers); + mOverlayContext, mSlideInView, mControllers, mSearchSessionController); viewController.show(animate); mAppsView = mOverlayContext.getAppsView(); diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java index 84cc00278b..4f75ef5599 100644 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java @@ -17,6 +17,8 @@ package com.android.launcher3.taskbar.allapps; import static com.android.app.animation.Interpolators.EMPHASIZED; +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; import android.animation.PropertyValuesHolder; import android.content.Context; import android.graphics.Canvas; @@ -63,14 +65,23 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView) {} + open fun setZeroStatePredictedItems(items: List) = Unit /** Updates the search suggestions shown in the zero-state. */ - open fun setZeroStateSearchSuggestions(items: List) {} + open fun setZeroStateSearchSuggestions(items: List) = Unit + + override fun onAllAppsTransitionStart(toAllApps: Boolean) = Unit + + override fun onAllAppsTransitionEnd(toAllApps: Boolean) = Unit /** 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 { diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionListener.java b/src/com/android/launcher3/allapps/AllAppsTransitionListener.java new file mode 100644 index 0000000000..4a17e29039 --- /dev/null +++ b/src/com/android/launcher3/allapps/AllAppsTransitionListener.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.allapps; + +/** + * An interface for listening to all-apps open-close transition + */ +public interface AllAppsTransitionListener { + /** + * Called when the transition starts + * @param toAllApps {@code true} if this transition is supposed to end in the AppApps UI + * + * @see ActivityAllAppsContainerView + */ + void onAllAppsTransitionStart(boolean toAllApps); + + /** + * Called when the transition ends + * @param toAllApps {@code true} if the final state is all-apps + * + * @see ActivityAllAppsContainerView + */ + void onAllAppsTransitionEnd(boolean toAllApps); +}