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

Commit e87cff37 authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Update HideNavInputEventReceiver when nav bar visibility has changed"... 

Merge "Update HideNavInputEventReceiver when nav bar visibility has changed" into rvc-dev am: 2615ccaa am: 685a356d am: 8e286e1d

Change-Id: I5b621a2324923d8ee10bc5bb3b4b2bf5a0f3036d
parents ba1d9e14 8e286e1d

services/core/java/com/android/server/wm/DisplayPolicy.java

+23 −19
Original line number Diff line number Diff line
@@ -1527,25 +1527,7 @@ public class DisplayPolicy { 
                && (mNotificationShade.getAttrs().privateFlags

                & PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION) != 0;



        // When the navigation bar isn't visible, we put up a fake input window to catch all

        // touch events. This way we can detect when the user presses anywhere to bring back the

        // nav bar and ensure the application doesn't see the event.

        if (navVisible || navAllowedHidden) {

            if (mInputConsumer != null) {

                mInputConsumer.dismiss();

                mHandler.sendMessage(

                        mHandler.obtainMessage(MSG_DISPOSE_INPUT_CONSUMER, mInputConsumer));

                mInputConsumer = null;

            }

        } else if (mInputConsumer == null && mStatusBar != null && canHideNavigationBar()) {

            mInputConsumer = mDisplayContent.getInputMonitor().createInputConsumer(

                    mHandler.getLooper(),

                    INPUT_CONSUMER_NAVIGATION,

                    HideNavInputEventReceiver::new);

            // As long as mInputConsumer is active, hover events are not dispatched to the app

            // and the pointer icon is likely to become stale. Hide it to avoid confusion.

            InputManager.getInstance().setPointerIconType(PointerIcon.TYPE_NULL);

        }

        updateHideNavInputEventReceiver(navVisible, navAllowedHidden);



        // For purposes of positioning and showing the nav bar, if we have decided that it can't

        // be hidden (because of the screen aspect ratio), then take that into account.
@@ -1567,6 +1549,28 @@ public class DisplayPolicy { 
        mLastNotificationShadeForcesShowingNavigation = notificationShadeForcesShowingNavigation;

    }



    void updateHideNavInputEventReceiver(boolean navVisible, boolean navAllowedHidden) {

        // When the navigation bar isn't visible, we put up a fake input window to catch all

        // touch events. This way we can detect when the user presses anywhere to bring back the

        // nav bar and ensure the application doesn't see the event.

        if (navVisible || navAllowedHidden) {

            if (mInputConsumer != null) {

                mInputConsumer.dismiss();

                mHandler.sendMessage(

                        mHandler.obtainMessage(MSG_DISPOSE_INPUT_CONSUMER, mInputConsumer));

                mInputConsumer = null;

            }

        } else if (mInputConsumer == null && mStatusBar != null && canHideNavigationBar()) {

            mInputConsumer = mDisplayContent.getInputMonitor().createInputConsumer(

                    mHandler.getLooper(),

                    INPUT_CONSUMER_NAVIGATION,

                    HideNavInputEventReceiver::new);

            // As long as mInputConsumer is active, hover events are not dispatched to the app

            // and the pointer icon is likely to become stale. Hide it to avoid confusion.

            InputManager.getInstance().setPointerIconType(PointerIcon.TYPE_NULL);

        }

    }



    private static void updateInsetsStateForDisplayCutout(DisplayFrames displayFrames,

            InsetsState state) {

        if (displayFrames.mDisplayCutout.getDisplayCutout().isEmpty()) {

services/core/java/com/android/server/wm/InsetsPolicy.java

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static android.view.InsetsController.ANIMATION_TYPE_SHOW; 
import static android.view.InsetsState.ITYPE_NAVIGATION_BAR;

import static android.view.InsetsState.ITYPE_STATUS_BAR;

import static android.view.SyncRtSurfaceTransactionApplier.applyParams;

import static android.view.WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_TOUCH;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_SHOW_STATUS_BAR;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION;
@@ -91,6 +92,12 @@ class InsetsPolicy { 
                || focusedWin != getNavControlTarget(focusedWin)

                || focusedWin.getRequestedInsetsState().getSource(ITYPE_NAVIGATION_BAR)

                        .isVisible());

        updateHideNavInputEventReceiver();

    }



    private void updateHideNavInputEventReceiver() {

        mPolicy.updateHideNavInputEventReceiver(!isHidden(ITYPE_NAVIGATION_BAR),

                mFocusedWin.mAttrs.insetsFlags.behavior != BEHAVIOR_SHOW_BARS_BY_TOUCH);

    }



    boolean isHidden(@InternalInsetsType int type) {
@@ -169,6 +176,7 @@ class InsetsPolicy { 
        if (windowState == getNavControlTarget(mFocusedWin)) {

            mNavBar.setVisible(state.getSource(ITYPE_NAVIGATION_BAR).isVisible());

        }

        updateHideNavInputEventReceiver();

    }



    /**