aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Specify display ID while calling getNavBarPosition()""" into ub-launcher3-master

Browse Source
This commit is contained in:
Winson Chung
2018-12-06 19:58:25 +00:00
committed by Android (Google) Code Review
parent 5466f284f3 506565aaa0
commit affe2bc261
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
quickstep/src/com/android/quickstep/TaskSystemShortcut.java
View File

@@ -18,6 +18,7 @@ package com.android.quickstep;
import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
import android.app.Activity;
import android.app.ActivityOptions;
import android.content.ComponentName;
import android.content.Intent;
@@ -49,6 +50,7 @@ import com.android.systemui.shared.recents.model.Task;
import com.android.systemui.shared.recents.view.AppTransitionAnimationSpecCompat;
import com.android.systemui.shared.recents.view.AppTransitionAnimationSpecsFuture;
import com.android.systemui.shared.recents.view.RecentsTransition;
import com.android.systemui.shared.system.ActivityCompat;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.ActivityOptionsCompat;
import com.android.systemui.shared.system.WindowManagerWrapper;
@@ -115,7 +117,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
}
protected abstract boolean isAvailable(BaseDraggingActivity activity);
protected abstract ActivityOptions makeLaunchOptions();
protected abstract ActivityOptions makeLaunchOptions(Activity activity);
protected abstract boolean onActivityStarted(BaseDraggingActivity activity);
@Override
@@ -160,7 +162,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
dismissTaskMenuView(activity);
ActivityOptions options = makeLaunchOptions();
ActivityOptions options = makeLaunchOptions(activity);
if (options != null
&& ActivityManagerWrapper.getInstance().startActivityFromRecents(taskId,
options)) {
@@ -222,8 +224,10 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
}
@Override
protected ActivityOptions makeLaunchOptions() {
final int navBarPosition = WindowManagerWrapper.getInstance().getNavBarPosition();
protected ActivityOptions makeLaunchOptions(Activity activity) {
final ActivityCompat act = new ActivityCompat(activity);
final int navBarPosition = WindowManagerWrapper.getInstance().getNavBarPosition(
act.getDisplayId());
if (navBarPosition == WindowManagerWrapper.NAV_BAR_POS_INVALID) {
return null;
}
@@ -257,7 +261,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
}
@Override
protected ActivityOptions makeLaunchOptions() {
protected ActivityOptions makeLaunchOptions(Activity activity) {
return ActivityOptionsCompat.makeFreeformOptions();
}