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

Commit 8d1c1abb authored by Maurice Lam's avatar Maurice Lam
Browse files

Launch activity intents on the StatusBar's display 

Add the activityOptions setCallerDisplayId and setLaunchDisplayId to
the display the StatusBar is currently on, so that the resulting
activity will be started in the same display as the user is interacting
with.

Bug: 175329765
Test: Manually tested using Exo. Tapping the notification on the Exo
brings it to the Exo virtual display, and tapping on the phone's native
status bar brings the activity back to the primary display.

Change-Id: I2f950131fa4d3aa1a9b423ae65902be68a628178
parent 6cd5cb73

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

+32 −4
Original line number Diff line number Diff line
@@ -2696,6 +2696,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
        return mDisplay.getRotation();

    }



    int getDisplayId() {

        return mDisplayId;

    }



    public void startActivityDismissingKeyguard(final Intent intent, boolean onlyProvisioned,

            boolean dismissShade, int flags) {

        startActivityDismissingKeyguard(intent, onlyProvisioned, dismissShade,
@@ -2721,7 +2725,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

            intent.addFlags(flags);

            int result = ActivityManager.START_CANCELED;

            ActivityOptions options = new ActivityOptions(getActivityOptions(

            ActivityOptions options = new ActivityOptions(getActivityOptions(mDisplayId,

                    null /* remoteAnimation */));

            options.setDisallowEnterPictureInPictureWhileLaunching(

                    disallowEnterPictureInPictureWhileLaunching);
@@ -4366,6 +4370,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        executeActionDismissingKeyguard(() -> {

            try {

                intent.send(null, 0, null, null, null, null, getActivityOptions(

                        mDisplayId,

                        mActivityLaunchAnimator.getLaunchAnimation(associatedView, isOccluded())));

            } catch (PendingIntent.CanceledException e) {

                // the stack trace isn't very helpful here.
@@ -4387,15 +4392,38 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mMainThreadHandler.post(runnable);

    }



    public static Bundle getActivityOptions(@Nullable RemoteAnimationAdapter animationAdapter) {

    /**

     * Returns an ActivityOptions bundle created using the given parameters.

     *

     * @param displayId The ID of the display to launch the activity in. Typically this would be the

     *                  display the status bar is on.

     * @param animationAdapter The animation adapter used to start this activity, or {@code null}

     *                         for the default animation.

     */

    public static Bundle getActivityOptions(int displayId,

            @Nullable RemoteAnimationAdapter animationAdapter) {

        return getDefaultActivityOptions(animationAdapter).toBundle();

    }



    public static Bundle getActivityOptions(@Nullable RemoteAnimationAdapter animationAdapter,

            boolean isKeyguardShowing, long eventTime) {

    /**

     * Returns an ActivityOptions bundle created using the given parameters.

     *

     * @param displayId The ID of the display to launch the activity in. Typically this would be the

     *                  display the status bar is on.

     * @param animationAdapter The animation adapter used to start this activity, or {@code null}

     *                         for the default animation.

     * @param isKeyguardShowing Whether keyguard is currently showing.

     * @param eventTime The event time in milliseconds since boot, not including sleep. See

     *                  {@link ActivityOptions#setSourceInfo}.

     */

    public static Bundle getActivityOptions(int displayId,

            @Nullable RemoteAnimationAdapter animationAdapter, boolean isKeyguardShowing,

            long eventTime) {

        ActivityOptions options = getDefaultActivityOptions(animationAdapter);

        options.setSourceInfo(isKeyguardShowing ? ActivityOptions.SourceInfo.TYPE_LOCKSCREEN

                : ActivityOptions.SourceInfo.TYPE_NOTIFICATION, eventTime);

        options.setLaunchDisplayId(displayId);

        options.setCallerDisplayId(displayId);

        return options.toBundle();

    }

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

+8 −2
Original line number Diff line number Diff line
@@ -427,8 +427,13 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
                                intent.getCreatorPackage(), adapter);

            }

            long eventTime = row.getAndResetLastActionUpTime();

            Bundle options = eventTime > 0 ? getActivityOptions(adapter,

                    mKeyguardStateController.isShowing(), eventTime) : getActivityOptions(adapter);

            Bundle options = eventTime > 0

                    ? getActivityOptions(

                            mStatusBar.getDisplayId(),

                            adapter,

                            mKeyguardStateController.isShowing(),

                            eventTime)

                    : getActivityOptions(mStatusBar.getDisplayId(), adapter);

            int launchResult = intent.sendAndReturnResult(mContext, 0, fillInIntent, null,

                    null, null, options);

            mMainThreadHandler.post(() -> {
@@ -450,6 +455,7 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
                int launchResult = TaskStackBuilder.create(mContext)

                        .addNextIntentWithParentStack(intent)

                        .startActivities(getActivityOptions(

                                mStatusBar.getDisplayId(),

                                mActivityLaunchAnimator.getLaunchAnimation(

                                        row, mStatusBar.isOccluded())),

                                new UserHandle(UserHandle.getUserId(appUid)));