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

Commit b3a72686 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Fix missing exclusion rect info in logs 

Bug: 382774299
Test: Manual, i.e. verified that exclusion rect shows up in bugreport
Flag: com.android.window.flags.enable_multidisplay_trackpad_back_gesture
Change-Id: I388016d7c8c9b768f21a76a9857d4df019e5f9f0
parent 24645ccc

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/DisplayBackGestureHandler.kt

+8 −2
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ interface DisplayBackGestureHandler { 


    fun isValidTrackpadBackGesture(): Boolean



    fun getExcludeRegion(): Region



    fun dispose()



    fun dump(prefix: String, writer: PrintWriter)
@@ -140,8 +142,10 @@ constructor( 
    override fun isValidTrackpadBackGesture(): Boolean {

        // for trackpad gestures, unless the whole screen is excluded region, 3-finger swipe

        // gestures are allowed even if the cursor is in the excluded region.

        val insets = windowManager.currentWindowMetrics.windowInsets

            .getInsets(WindowInsets.Type.systemBars())

        val insets =

            windowManager.currentWindowMetrics.windowInsets.getInsets(

                WindowInsets.Type.systemBars()

            )

        return !excludeRegion.bounds.contains(

            insets.left,

            insets.top,
@@ -150,6 +154,8 @@ constructor( 
        )

    }



    override fun getExcludeRegion() = excludeRegion



    override fun dispose() {

        inputEventReceiver.dispose()

        inputMonitorCompat.dispose()

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+3 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,9 @@ public class EdgeBackGestureHandler { 
                    QuickStepContract.isBackGestureDisabled(mSysUiFlags,

                            mIsTrackpadThreeFingerSwipe), mDisabledForQuickstep,

                    mGestureBlockingActivityRunning.get(), mIsInPip, mDisplaySize,

                    mEdgeWidthLeft, mLeftInset, mEdgeWidthRight, mRightInset, mExcludeRegion));

                    mEdgeWidthLeft, mLeftInset, mEdgeWidthRight, mRightInset,

                    DesktopExperienceFlags.ENABLE_MULTIDISPLAY_TRACKPAD_BACK_GESTURE.isTrue()

                            ? displayBackGestureHandler.getExcludeRegion() : mExcludeRegion));

        } else if (mAllowGesture || mLogGesture) {

            boolean mLastFrameThresholdCrossed = mThresholdCrossed;

            if (!mThresholdCrossed) {