Merge "Add IPipAnimationListener#onExpandPip" into tm-dev

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

@@ -32,4 +32,9 @@ oneway interface IPipAnimationListener {
      * @param cornerRadius the pixel value of the corner radius, zero means it's disabled.
      */
     void onPipCornerRadiusChanged(int cornerRadius);
+
+    /**
+     * Notifies the listener that user leaves PiP by tapping on the expand button.
+     */
+    void onExpandPip();
 }

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

@@ -137,6 +137,11 @@ public class PipController implements PipTransitionController.PipTransitionCallb
          * @param cornerRadius the pixel value of the corner radius, zero means it's disabled.
          */
         void onPipCornerRadiusChanged(int cornerRadius);
+
+        /**
+         * Notifies the listener that user leaves PiP by tapping on the expand button.
+         */
+        void onExpandPip();
     }
 
     /**
@@ -652,6 +657,9 @@ public class PipController implements PipTransitionController.PipTransitionCallb
         mTouchHandler.setTouchEnabled(false);
         if (mPinnedStackAnimationRecentsCallback != null) {
             mPinnedStackAnimationRecentsCallback.onPipAnimationStarted();
+            if (direction == TRANSITION_DIRECTION_LEAVE_PIP) {
+                mPinnedStackAnimationRecentsCallback.onExpandPip();
+            }
         }
     }
 
@@ -911,6 +919,11 @@ public class PipController implements PipTransitionController.PipTransitionCallb
             public void onPipCornerRadiusChanged(int cornerRadius) {
                 mListener.call(l -> l.onPipCornerRadiusChanged(cornerRadius));
             }
+
+            @Override
+            public void onExpandPip() {
+                mListener.call(l -> l.onExpandPip());
+            }
         };
 
         IPipImpl(PipController controller) {