Merge "Set launcher state to NORMAL when entering desktop" into tm-qpr-dev
diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskView.java b/quickstep/src/com/android/quickstep/views/DesktopTaskView.java
index 8385afe..5167bd7 100644
--- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.java
+++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.java
@@ -286,31 +286,23 @@
@Override
public RunnableList launchTasks() {
- showDesktopApps();
- getRecentsView().onTaskLaunchedInLiveTileMode();
+ SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps();
+ getRecentsView().startHome();
return new RunnableList();
}
@Nullable
@Override
public RunnableList launchTaskAnimated() {
- RunnableList endCallback = new RunnableList();
- showDesktopApps();
- RecentsView<?, ?> recentsView = getRecentsView();
- recentsView.addSideTaskLaunchCallback(endCallback);
- return endCallback;
+ return launchTasks();
}
@Override
public void launchTask(@NonNull Consumer<Boolean> callback, boolean freezeTaskList) {
- showDesktopApps();
+ launchTasks();
callback.accept(true);
}
- private void showDesktopApps() {
- SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps();
- }
-
@Override
void refreshThumbnails(@Nullable HashMap<Integer, ThumbnailData> thumbnailDatas) {
// Sets new thumbnails based on the incoming data and refreshes the rest.