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

Commit f99f0460 authored Apr 15, 2024 by Lynn Yeh Committed by Android (Google) Code Review Apr 15, 2024

Merge "Close the KQS view when touching the gesture nav region" into 24D1-dev

parents cb374257 5a85b4f2

quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -193,10 +193,14 @@ public final class KeyboardQuickSwitchController implements
	}		}

	void closeQuickSwitchView() {		void closeQuickSwitchView() {
			closeQuickSwitchView(true);
			}

			void closeQuickSwitchView(boolean animate) {
	if (mQuickSwitchViewController == null) {		if (mQuickSwitchViewController == null) {
	return;		return;
	}		}
	mQuickSwitchViewController.closeQuickSwitchView(true);		mQuickSwitchViewController.closeQuickSwitchView(animate);
	}		}

	/**		/**

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1567,4 +1567,9 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
	public float getStashedTaskbarScale() {		public float getStashedTaskbarScale() {
	return mControllers.stashedHandleViewController.getStashedHandleHintScale().value;		return mControllers.stashedHandleViewController.getStashedHandleHintScale().value;
	}		}

			/** Closes the KeyboardQuickSwitchView without an animation if open. */
			public void closeKeyboardQuickSwitchView() {
			mControllers.keyboardQuickSwitchController.closeQuickSwitchView(false);
			}
	}		}

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -248,7 +248,15 @@ public class OverviewCommandHelper {
	case TYPE_SHOW:		case TYPE_SHOW:
	// already visible		// already visible
	return true;		return true;
			case TYPE_KEYBOARD_INPUT: {
			if (visibleRecentsView.isHandlingTouch()) {
			return true;
			}
			}
	case TYPE_HIDE: {		case TYPE_HIDE: {
			if (visibleRecentsView.isHandlingTouch()) {
			return true;
			}
	mKeyboardTaskFocusIndex = INVALID_PAGE;		mKeyboardTaskFocusIndex = INVALID_PAGE;
	int currentPage = visibleRecentsView.getNextPage();		int currentPage = visibleRecentsView.getNextPage();
	TaskView tv = (currentPage >= 0		TaskView tv = (currentPage >= 0

quickstep/src/com/android/quickstep/TouchInteractionService.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -754,6 +754,10 @@ public class TouchInteractionService extends Service {

	boolean isOneHandedModeActive = mDeviceState.isOneHandedModeActive();		boolean isOneHandedModeActive = mDeviceState.isOneHandedModeActive();
	boolean isInSwipeUpTouchRegion = mRotationTouchHelper.isInSwipeUpTouchRegion(event);		boolean isInSwipeUpTouchRegion = mRotationTouchHelper.isInSwipeUpTouchRegion(event);
			TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext();
			if (isInSwipeUpTouchRegion && tac != null) {
			tac.closeKeyboardQuickSwitchView();
			}
	if ((!isOneHandedModeActive && isInSwipeUpTouchRegion)		if ((!isOneHandedModeActive && isInSwipeUpTouchRegion)
	\|\| isHoverActionWithoutConsumer) {		\|\| isHoverActionWithoutConsumer) {
	reasonString.append(!isOneHandedModeActive && isInSwipeUpTouchRegion		reasonString.append(!isOneHandedModeActive && isInSwipeUpTouchRegion

quickstep/src/com/android/quickstep/views/RecentsView.java

+23 −22

Original line number	Original line	Diff line number	Diff line
	@@ -4237,7 +4237,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T

	@Override		@Override
	public boolean dispatchKeyEvent(KeyEvent event) {		public boolean dispatchKeyEvent(KeyEvent event) {
	if (event.getAction() == KeyEvent.ACTION_DOWN) {		if (isHandlingTouch() \|\| event.getAction() != KeyEvent.ACTION_DOWN) {
			return super.dispatchKeyEvent(event);
			}
	switch (event.getKeyCode()) {		switch (event.getKeyCode()) {
	case KeyEvent.KEYCODE_TAB:		case KeyEvent.KEYCODE_TAB:
	return snapToPageRelative(event.isShiftPressed() ? -1 : 1, true /* cycle */,		return snapToPageRelative(event.isShiftPressed() ? -1 : 1, true /* cycle */,
	@@ -4261,7 +4263,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
	return true;		return true;
	}		}
	}		}
	}
	return super.dispatchKeyEvent(event);		return super.dispatchKeyEvent(event);
	}		}