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

Commit afa0de8a authored by Garfield Tan's avatar Garfield Tan
Browse files

Notify when task changes requested orientation. 

This allows listener know task's orientation request change before
handling display rotation through IDisplayWindowRotationController if
they can register a local TaskStackListener.

Bug: 150409355
Test: atest WmTests:TaskStackChangedListenerTest#testNotifyTaskRequestedOrientationChanged
Change-Id: Id7bfc3e63329ce26d454b7e9c143e084e04dd365
parent b8ad491e

core/java/android/app/ITaskStackListener.aidl

+11 −0
Original line number Diff line number Diff line
@@ -205,4 +205,15 @@ oneway interface ITaskStackListener { 
     * @param {@code true} if the task got focus, {@code false} if it lost it.

     */

    void onTaskFocusChanged(int taskId, boolean focused);



    /**

     * Called when a task changes its requested orientation. It is different from {@link

     * #onActivityRequestedOrientationChanged(int, int)} in the sense that this method is called

     * when a task changes requested orientation due to activity launch, dimiss or reparenting.

     *

     * @param taskId id of the task.

     * @param requestedOrientation the new requested orientation of this task as screen orientations

     *                             in {@link android.content.pm.ActivityInfo}.

     */

     void onTaskRequestedOrientationChanged(int taskId, int requestedOrientation);

}

core/java/android/app/TaskStackListener.java

+4 −0
Original line number Diff line number Diff line
@@ -195,4 +195,8 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    @Override

    public void onTaskFocusChanged(int taskId, boolean focused) {

    }



    @Override

    public void onTaskRequestedOrientationChanged(int taskId, int requestedOrientation) {

    }

}

services/core/java/com/android/server/wm/DisplayContent.java

+7 −0
Original line number Diff line number Diff line
@@ -1392,6 +1392,13 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        final WindowContainer orientationSource = getLastOrientationSource();

        final ActivityRecord r =

                orientationSource != null ? orientationSource.asActivityRecord() : null;

        if (r != null && r.getTask() != null

                && orientation != r.getTask().mLastReportedRequestedOrientation) {

            final Task task = r.getTask();

            task.mLastReportedRequestedOrientation = orientation;

            mAtmService.getTaskChangeNotificationController()

                    .notifyTaskRequestedOrientationChanged(task.mTaskId, orientation);

        }

        // Currently there is no use case from non-activity.

        if (r != null && handleTopActivityLaunchingInDifferentOrientation(r)) {

            // Display orientation should be deferred until the top fixed rotation is finished.

services/core/java/com/android/server/wm/Task.java

+8 −0
Original line number Diff line number Diff line
@@ -368,6 +368,14 @@ class Task extends WindowContainer<WindowContainer> { 
    @Surface.Rotation

    private int mRotation;



    /**

     * Last requested orientation reported to DisplayContent. This is different from {@link

     * #mOrientation} in the sense that this takes activities' requested orientation into

     * account. Start with {@link ActivityInfo#SCREEN_ORIENTATION_UNSPECIFIED} so that we don't need

     * to notify for activities that don't specify any orientation.

     */

    int mLastReportedRequestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;



    // For comparison with DisplayContent bounds.

    private Rect mTmpRect = new Rect();

    // For handling display rotations.

services/core/java/com/android/server/wm/TaskChangeNotificationController.java

+16 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ class TaskChangeNotificationController { 
    private static final int NOTIFY_SINGLE_TASK_DISPLAY_EMPTY = 25;

    private static final int NOTIFY_TASK_LIST_FROZEN_UNFROZEN_MSG = 26;

    private static final int NOTIFY_TASK_FOCUS_CHANGED_MSG = 27;

    private static final int NOTIFY_TASK_REQUESTED_ORIENTATION_CHANGED_MSG = 28;



    // Delay in notifying task stack change listeners (in millis)

    private static final int NOTIFY_TASK_STACK_CHANGE_LISTENERS_DELAY = 100;
@@ -178,6 +179,10 @@ class TaskChangeNotificationController { 
        l.onTaskFocusChanged(m.arg1, m.arg2 != 0);

    };



    private final TaskStackConsumer mNotifyTaskRequestedOrientationChanged = (l, m) -> {

        l.onTaskRequestedOrientationChanged(m.arg1, m.arg2);

    };



    @FunctionalInterface

    public interface TaskStackConsumer {

        void accept(ITaskStackListener t, Message m) throws RemoteException;
@@ -269,6 +274,9 @@ class TaskChangeNotificationController { 
                case NOTIFY_TASK_FOCUS_CHANGED_MSG:

                    forAllRemoteListeners(mNotifyTaskFocusChanged, msg);

                    break;

                case NOTIFY_TASK_REQUESTED_ORIENTATION_CHANGED_MSG:

                    forAllRemoteListeners(mNotifyTaskRequestedOrientationChanged, msg);

                    break;

            }

            if (msg.obj instanceof SomeArgs) {

                ((SomeArgs) msg.obj).recycle();
@@ -558,4 +566,12 @@ class TaskChangeNotificationController { 
        forAllLocalListeners(mNotifyTaskFocusChanged, msg);

        msg.sendToTarget();

    }



    /** @see android.app.ITaskStackListener#onTaskRequestedOrientationChanged(int, int) */

    void notifyTaskRequestedOrientationChanged(int taskId, int requestedOrientation) {

        final Message msg = mHandler.obtainMessage(NOTIFY_TASK_REQUESTED_ORIENTATION_CHANGED_MSG,

                taskId, requestedOrientation);

        forAllLocalListeners(mNotifyTaskRequestedOrientationChanged, msg);

        msg.sendToTarget();

    }

}