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

Commit 3a32d357 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev 

am: 2e86be76

Change-Id: Idec10c8c0aadccabcd639b5a02e426dc677b9f14
parents 299ae2f4 2e86be76

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ public class PipTouchHandler implements TunerService.Tunable { 
                mMenuController.showMenu(MENU_STATE_FULL, mMotionHelper.getBounds(),

                        mMovementBounds, true /* allowMenuTimeout */);

            } else {

                mMenuController.hideMenu();

                mMotionHelper.expandPip();

            }

            return true;

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -10534,8 +10534,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    if (stackId == PINNED_STACK_ID) {

                        final PinnedActivityStack pinnedStack =

                                mStackSupervisor.getStack(PINNED_STACK_ID);

                        pinnedStack.animateResizePinnedStack(null /* sourceBounds */, destBounds,

                                animationDuration);

                        if (pinnedStack != null) {

                            pinnedStack.animateResizePinnedStack(null /* sourceBounds */,

                                    destBounds, animationDuration);

                        }

                    } else {

                        throw new IllegalArgumentException("Stack: " + stackId

                                + " doesn't support animated resize.");