Merge "Fix missing exclusion rect info in logs" into main (0e1761ff) · Commits · e / os / android_frameworks_base

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()

+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) {