diff options
author | Tiger Huang <tigerhuang@google.com> | 2018-11-29 20:27:17 +0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2018-12-04 10:14:44 -0800 |
commit | 6f43bc63f455a24b2819fc2ba2117cc7c3d4f3a0 (patch) | |
tree | 282c6c1db8ffc3271053ddceb0723795251e18d0 /quickstep/src | |
parent | 8bcc8d627a2f4f314b9ab8771e81338853382f8d (diff) | |
download | android_packages_apps_Trebuchet-6f43bc63f455a24b2819fc2ba2117cc7c3d4f3a0.tar.gz android_packages_apps_Trebuchet-6f43bc63f455a24b2819fc2ba2117cc7c3d4f3a0.tar.bz2 android_packages_apps_Trebuchet-6f43bc63f455a24b2819fc2ba2117cc7c3d4f3a0.zip |
Specify display ID while calling getNavBarPosition()
Navigation bar can show on non-default display now. So the caller
should specify which display the desired navigation bar is on.
Bug: 117474929
Test: atest Launcher3Tests
Change-Id: Ibb22e51730ab145a42a129b4d964299acd4efd56
(cherry picked from commit f1bb3a4d4c9a1c6ba5cff5550b6d6b2b84ff272f)
Diffstat (limited to 'quickstep/src')
-rw-r--r-- | quickstep/src/com/android/quickstep/TaskSystemShortcut.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java index c81f04403..42a28fbfa 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<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(); } |