Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4adc1a9d authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Automerger Merge Worker
Browse files

Merge "Don't use WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY" into sc-dev am: 3c8f9e1f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14215791

Change-Id: Ie3a27187efbc06390f685ec71c4a6b9d15f25927
parents 329798b9 3c8f9e1f

packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java

+0 −2
Original line number Diff line number Diff line
@@ -169,8 +169,6 @@ public class NotificationRemoteInputManager implements Dumpable { 
            return mCallback.handleRemoteViewClick(view, pendingIntent,

                    action == null ? false : action.isAuthenticationRequired(), () -> {

                    Pair<Intent, ActivityOptions> options = response.getLaunchOptions(view);

                    options.second.setLaunchWindowingMode(

                            WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY);

                    mLogger.logStartingIntentWithDefaultHandler(entry, pendingIntent);

                    return RemoteViews.startPendingIntent(view, pendingIntent, options);

            });

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+0 −3
Original line number Diff line number Diff line
@@ -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;

    }