From 506565aaa0da27a56e7db0cff9602aef57c8c8a6 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 6 Dec 2018 19:37:01 +0000 Subject: [PATCH] Revert "Revert "Specify display ID while calling getNavBarPosition()"" This reverts commit 5859f7d62c8c69ce8180f16291d714298249d09b. Reason for revert: Most test devices have the platform changes Change-Id: I86b61f07f873e0d231aaac322001065730436233 --- .../com/android/quickstep/TaskSystemShortcut.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java index c81f04403b..42a28fbfa9 100644 --- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java +++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java @@ -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 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 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 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 extends SystemShortcut } @Override - protected ActivityOptions makeLaunchOptions() { + protected ActivityOptions makeLaunchOptions(Activity activity) { return ActivityOptionsCompat.makeFreeformOptions(); }