From b4ab288c817c3f04f02a987ba6924c0d4223e0a8 Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Fri, 16 Apr 2021 13:57:58 -0700 Subject: [PATCH] Don't use WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY Temp. solution to get the build going. This is okay as we need to remove this option anyways since we are now using WindowContainerTransaction#setLaunchRoot Bug: 185192439 Test: manual Change-Id: I5b7fa6c9ddb57b74af4b8e0862723e1f7c4e72bd --- .../systemui/statusbar/NotificationRemoteInputManager.java | 2 -- .../src/com/android/systemui/statusbar/phone/StatusBar.java | 3 --- 2 files changed, 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java index 23e6a9f5d1912..0e56ab73397ba 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java @@ -169,8 +169,6 @@ public class NotificationRemoteInputManager implements Dumpable { return mCallback.handleRemoteViewClick(view, pendingIntent, action == null ? false : action.isAuthenticationRequired(), () -> { Pair options = response.getLaunchOptions(view); - options.second.setLaunchWindowingMode( - WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY); mLogger.logStartingIntentWithDefaultHandler(entry, pendingIntent); return RemoteViews.startPendingIntent(view, pendingIntent, options); }); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 43d525d5098e7..0e99d3a3a7165 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -4622,9 +4622,6 @@ public class StatusBar extends SystemUI implements DemoMode, } else { options = ActivityOptions.makeBasic(); } - // Anything launched from the notification shade should always go into the secondary - // split-screen windowing mode. - options.setLaunchWindowingMode(WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY); return options; }