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

Commit 700990be authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Android (Google) Code Review
Browse files

Revert "[Pip2] Add a new interface method to IPipAnimationListener" 

This reverts commit 5eadb359.

Reason for revert: We no longer want to reload Recents when dismissing PiP.

Change-Id: I14cebd2a7c113761575546c896a1bb82f7bf5dea
parent 5eadb359

libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/IPipAnimationListener.aidl

+0 −5
Original line number Diff line number Diff line
@@ -38,9 +38,4 @@ oneway interface IPipAnimationListener { 
     * Notifies the listener that user leaves PiP by tapping on the expand button.

     */

    void onExpandPip();



    /**

     * Notifies the listener that the PiP has exited.

     */

    void onExitPip();

}

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+0 −10
Original line number Diff line number Diff line
@@ -238,11 +238,6 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
         * Notifies the listener that user leaves PiP by tapping on the expand button.

         */

        void onExpandPip();



        /**

         * Notifies the listener that the PiP has exited.

         */

        void onExitPip();

    }



    /**
@@ -1310,11 +1305,6 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
            public void onExpandPip() {

                mListener.call(l -> l.onExpandPip());

            }



            @Override

            public void onExitPip() {

                mListener.call(l -> l.onExitPip());

            }

        };



        IPipImpl(PipController controller) {

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java

+0 −13
Original line number Diff line number Diff line
@@ -150,11 +150,6 @@ public class PipController implements ConfigurationChangeListener, 
         * Notifies the listener that user leaves PiP by tapping on the expand button.

         */

        void onExpandPip();



        /**

         * Notifies the listener that the PiP has exited.

         */

        void onExitPip();

    }



    private PipController(Context context,
@@ -626,9 +621,6 @@ public class PipController implements ConfigurationChangeListener, 
                for (Consumer<Boolean> listener : mOnIsInPipStateChangedListeners) {

                    listener.accept(false /* inPip */);

                }

                if (mPipRecentsAnimationListener != null) {

                    mPipRecentsAnimationListener.onExitPip();

                }

                break;

            case PipTransitionState.SCHEDULED_BOUNDS_CHANGE:

                mWaitingToPlayDisplayChangeBoundsUpdate =
@@ -781,11 +773,6 @@ public class PipController implements ConfigurationChangeListener, 
            public void onExpandPip() {

                mListener.call(l -> l.onExpandPip());

            }



            @Override

            public void onExitPip() {

                mListener.call(l -> l.onExitPip());

            }

        };



        IPipImpl(PipController controller) {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -207,8 +207,6 @@ public class PipControllerTest extends ShellTestCase { 
            public void onPipResourceDimensionsChanged(int cornerRadius, int shadowRadius) {}

            @Override

            public void onExpandPip() {}

            @Override

            public void onExitPip() {}

        });

        assertTrue(mPipController.hasPinnedStackAnimationListener());

        // Create initial interface