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

Commit 52abac27 authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into... 

Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065341

Change-Id: If0f27e8d83ee1879b7cfeef526d6fc37d4b07dee
parents 961ad933 d4445e0c

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

+0 −6
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ public class PipTouchHandler { 
    private float mSavedSnapFraction = -1f;

    private boolean mSendingHoverAccessibilityEvents;

    private boolean mMovementWithinDismiss;

    private boolean mHideMenuAfterShown = false;

    private PipAccessibilityInteractionConnection mConnection;



    // Touch state
@@ -726,7 +725,6 @@ public class PipTouchHandler { 
                // on and changing MotionEvents into HoverEvents.

                // Let's not enable menu show/hide for a11y services.

                if (!mAccessibilityManager.isTouchExplorationEnabled()) {

                    mHideMenuAfterShown = true;

                    mTouchState.scheduleHoverExitTimeoutCallback();

                }

                if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) {
@@ -813,9 +811,6 @@ public class PipTouchHandler { 
                mSavedSnapFraction = mMotionHelper.animateToExpandedState(expandedBounds,

                        mMovementBounds, mExpandedMovementBounds, callback);

            }

            if (mHideMenuAfterShown) {

                mMenuController.hideMenu();

            }

        } else if (menuState == MENU_STATE_NONE && mMenuState == MENU_STATE_FULL) {

            // Try and restore the PiP to the closest edge, using the saved snap fraction

            // if possible
@@ -853,7 +848,6 @@ public class PipTouchHandler { 
            }

        }

        mMenuState = menuState;

        mHideMenuAfterShown = false;

        updateMovementBounds();

        // If pip menu has dismissed, we should register the A11y ActionReplacingConnection for pip

        // as well, or it can't handle a11y focus and pip menu can't perform any action.