commit 8d957872117facc842fdc9adfe51dd55d5ad8f9d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 28 01:27:09 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 28 01:27:09 2020 +0000
tree ee721815e6b07a1004b464c61e0914d714e4f362
parent 149ec480a70a7d578d403d2e335e7fd37b0e5cd3
parent 7989848eeb83099b413387e3d90acac37c28e699

Merge changes I059b042f,I9a1eb45c,I34647ced into ub-launcher3-master

* changes:
  Combining two handlers into one
  Unifying handler (#2) BaseSwipeUpHandler => AbsSwipeUpHandler
  Unifying handler (#1) BaseSwipeUpHandlerV2 => AbsSwipeUpHandler

src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java

diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
index c996748..31c3014 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -20,6 +20,7 @@
 import android.app.ActivityOptions;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Display;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewAnimationUtils;
@@ -168,7 +169,9 @@
 
     @Override
     public ActivityOptions getActivityLaunchOptions(View v) {
-        return null;
+        final Display display = getWindow().getDecorView().getDisplay();
+        return display != null ? ActivityOptions.makeBasic().setLaunchDisplayId(
+                       display.getDisplayId()) : null;
     }
 
     @Override