Merge "Close the KQS view when touching the gesture nav region" into main (06e819d6) · Commits · e / os / android_packages_apps_Trebuchet

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

+5 −1

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

		void closeQuickSwitchView() {
		closeQuickSwitchView(true);
		}

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

		/**

+5 −0

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

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

+8 −0

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

+4 −0

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

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

+23 −22

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

		@Override
		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()) {
		case KeyEvent.KEYCODE_TAB:
		return snapToPageRelative(event.isShiftPressed() ? -1 : 1, true /* cycle */,
		@@ -4255,7 +4257,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		return true;
		}
		}
		}
		return super.dispatchKeyEvent(event);
		}