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

Commit f709fd9f authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Pass displayId to onActivityRotation()" into rvc-dev am:... 

Merge "Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b709 am: 73095787 am: e0ddf1d3" into rvc-qpr-dev-plus-aosp
parents a6536f57 4b467302

core/java/android/app/ITaskStackListener.aidl

+3 −1
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ oneway interface ITaskStackListener { 
     *   * forced rotation

     *   * rotation settings set through adb command line

     *   * rotation that occurs when rotation tile is toggled in quick settings

     *

     * @param displayId id of the display where activity will rotate

     */

     void onActivityRotation();

     void onActivityRotation(int displayId);

}

core/java/android/app/TaskStackListener.java

+1 −1
Original line number Diff line number Diff line
@@ -201,6 +201,6 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    }



    @Override

    public void onActivityRotation() {

    public void onActivityRotation(int displayId) {

    }

}

packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java

+2 −2
Original line number Diff line number Diff line
@@ -115,6 +115,6 @@ public abstract class TaskStackChangeListener { 
    /** @see ITaskStackListener#onRecentTaskListFrozenChanged(boolean) */

    public void onRecentTaskListFrozenChanged(boolean frozen) { }



    /** @see ITaskStackListener#onActivityRotation()*/

    public void onActivityRotation() { }

    /** @see ITaskStackListener#onActivityRotation(int)*/

    public void onActivityRotation(int displayId) { }

}

packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java

+4 −3
Original line number Diff line number Diff line
@@ -238,8 +238,9 @@ public class TaskStackChangeListeners extends TaskStackListener { 
    }



    @Override

    public void onActivityRotation() {

        mHandler.obtainMessage(H.ON_ACTIVITY_ROTATION).sendToTarget();

    public void onActivityRotation(int displayId) {

        mHandler.obtainMessage(H.ON_ACTIVITY_ROTATION, displayId, 0 /* unused */)

                .sendToTarget();

    }



    private final class H extends Handler {
@@ -435,7 +436,7 @@ public class TaskStackChangeListeners extends TaskStackListener { 
                    }

                    case ON_ACTIVITY_ROTATION: {

                        for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) {

                            mTaskStackListeners.get(i).onActivityRotation();

                            mTaskStackListeners.get(i).onActivityRotation(msg.arg1);

                        }

                        break;

                    }

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

+5 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ class TaskChangeNotificationController { 
    };



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

        l.onActivityRotation();

        l.onActivityRotation(m.arg1);

    };



    @FunctionalInterface
@@ -583,9 +583,10 @@ class TaskChangeNotificationController { 
        msg.sendToTarget();

    }



    /** @see android.app.ITaskStackListener#onActivityRotation() */

    void notifyOnActivityRotation() {

        final Message msg = mHandler.obtainMessage(NOTIFY_ACTIVITY_ROTATED_MSG);

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

    void notifyOnActivityRotation(int displayId) {

        final Message msg = mHandler.obtainMessage(NOTIFY_ACTIVITY_ROTATED_MSG,

                displayId, 0 /* unused */);

        forAllLocalListeners(mNotifyOnActivityRotation, msg);

        msg.sendToTarget();

    }