PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Invoke home via recents for fallback recents" into sc-v2-dev am: 9b762e9778

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

Change-Id: Ibfadc5c4a295be844c9a193a9f9a415159f35b8d
This commit is contained in:
TreeHugger Robot
2021-08-05 22:24:03 +00:00
committed by Automerger Merge Worker
parent c99a3ffa66 9b762e9778
commit e10975e88e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
+1 -4
View File
@@ -18,7 +18,6 @@ package com.android.launcher3.taskbar;
import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.DEFAULT_DISPLAY;
import android.content.Intent;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
@@ -90,9 +89,7 @@ public class TaskbarNavButtonController {
} }
private void navigateHome() { private void navigateHome() {
mService.startActivity(new Intent(Intent.ACTION_MAIN) mService.getOverviewCommandHelper().addCommand(OverviewCommandHelper.TYPE_HOME);
.addCategory(Intent.CATEGORY_HOME)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
private void navigateToOverview() { private void navigateToOverview() {
quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+8
View File
@@ -49,6 +49,7 @@ public class OverviewCommandHelper {
public static final int TYPE_SHOW_NEXT_FOCUS = 2; public static final int TYPE_SHOW_NEXT_FOCUS = 2;
public static final int TYPE_HIDE = 3; public static final int TYPE_HIDE = 3;
public static final int TYPE_TOGGLE = 4; public static final int TYPE_TOGGLE = 4;
public static final int TYPE_HOME = 5;
private static final String TRANSITION_NAME = "Transition:toOverview"; private static final String TRANSITION_NAME = "Transition:toOverview";
@@ -154,6 +155,10 @@ public class OverviewCommandHelper {
// already hidden // already hidden
return true; return true;
} }
if (cmd.type == TYPE_HOME) {
mService.startActivity(mOverviewComponentObserver.getHomeIntent());
return true;
}
} else { } else {
switch (cmd.type) { switch (cmd.type) {
case TYPE_SHOW: case TYPE_SHOW:
@@ -168,6 +173,9 @@ public class OverviewCommandHelper {
} }
case TYPE_TOGGLE: case TYPE_TOGGLE:
return launchTask(recents, getNextTask(recents), cmd); return launchTask(recents, getNextTask(recents), cmd);
case TYPE_HOME:
recents.startHome();
return true;
} }
} }