Merge "Revert "[Pip2] Add a new interface method to IPipAnimationListener"" into main (9a00cdf1) · Commits · e / os / android_frameworks_base

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();
		}

+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();
		}

		/**
		@@ -1312,11 +1307,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) {

+0 −13

Original line number	Diff line number	Diff line
		@@ -151,11 +151,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,
		@@ -632,9 +627,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 =
		@@ -793,11 +785,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) {

+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