commit 64594c803a24dcd3ac57e2ddf077ebfc5c8fc3c9
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 23 20:38:50 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 23 20:38:50 2020 +0000
tree cecd5f4b8114716e742b384e3ac8ce5bc7335ea9
parent cd0c18460ae6f9fa3dcf40599952575a719f4034
parent beb416cd4f3c14f2af3650c441f4ecd0f1e5f2a1

Merge "Revert "Add ActivityOptions for SecondDisplayLaucher to launch activity""

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 2adf8ce..b496608 100644
--- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
+++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
@@ -20,7 +20,6 @@
 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;
@@ -170,9 +169,7 @@
 
     @Override
     public ActivityOptions getActivityLaunchOptions(View v) {
-        final Display display = getWindow().getDecorView().getDisplay();
-        return display != null ? ActivityOptions.makeBasic().setLaunchDisplayId(
-                       display.getDisplayId()) : null;
+        return null;
     }
 
     @Override