Revert "Specify display ID while calling getNavBarPosition()"
This reverts commit 6f43bc63f455a24b2819fc2ba2117cc7c3d4f3a0.
Reason for revert: <INSERT REASONING HERE>
Change-Id: Ia5c728abd4690acad721b1edcab3f42b7b073cd7
diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
index 42a28fb..c81f044 100644
--- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
@@ -18,7 +18,6 @@
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;
@@ -50,7 +49,6 @@
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;
@@ -117,7 +115,7 @@
}
protected abstract boolean isAvailable(BaseDraggingActivity activity);
- protected abstract ActivityOptions makeLaunchOptions(Activity activity);
+ protected abstract ActivityOptions makeLaunchOptions();
protected abstract boolean onActivityStarted(BaseDraggingActivity activity);
@Override
@@ -162,7 +160,7 @@
dismissTaskMenuView(activity);
- ActivityOptions options = makeLaunchOptions(activity);
+ ActivityOptions options = makeLaunchOptions();
if (options != null
&& ActivityManagerWrapper.getInstance().startActivityFromRecents(taskId,
options)) {
@@ -224,10 +222,8 @@
}
@Override
- protected ActivityOptions makeLaunchOptions(Activity activity) {
- final ActivityCompat act = new ActivityCompat(activity);
- final int navBarPosition = WindowManagerWrapper.getInstance().getNavBarPosition(
- act.getDisplayId());
+ protected ActivityOptions makeLaunchOptions() {
+ final int navBarPosition = WindowManagerWrapper.getInstance().getNavBarPosition();
if (navBarPosition == WindowManagerWrapper.NAV_BAR_POS_INVALID) {
return null;
}
@@ -261,7 +257,7 @@
}
@Override
- protected ActivityOptions makeLaunchOptions(Activity activity) {
+ protected ActivityOptions makeLaunchOptions() {
return ActivityOptionsCompat.makeFreeformOptions();
}