Fix regression where keyboard couldn't switch between workspace pages. (c2bc0ef1) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/util/FocusLogic.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -22,9 +22,6 @@ import android.view.View;
		import android.view.ViewGroup;

		import com.android.launcher3.CellLayout;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherAppState;
		import com.android.launcher3.ShortcutAndWidgetContainer;

		import java.util.Arrays;
		@@ -51,7 +48,7 @@ public class FocusLogic {
		private static final String TAG = "FocusLogic";
		private static final boolean DEBUG = false;

		// Item and page index related constant used by {@link #handleKeyEvent}.
		/** Item and page index related constant used by {@link #handleKeyEvent}. */
		public static final int NOOP = -1;

		public static final int PREVIOUS_PAGE_RIGHT_COLUMN = -2;
		@@ -94,7 +91,7 @@ public class FocusLogic {
		switch (keyCode) {
		case KeyEvent.KEYCODE_DPAD_LEFT:
		newIndex = handleDpadHorizontal(iconIdx, cntX, cntY, map, -1 /increment/);
		if (isRtl && newIndex == NOOP && pageIndex > 0) {
		if (!isRtl && newIndex == NOOP && pageIndex > 0) {
		newIndex = PREVIOUS_PAGE_RIGHT_COLUMN;
		} else if (isRtl && newIndex == NOOP && pageIndex < pageCount - 1) {
		newIndex = NEXT_PAGE_RIGHT_COLUMN;
		@@ -102,7 +99,7 @@ public class FocusLogic {
		break;
		case KeyEvent.KEYCODE_DPAD_RIGHT:
		newIndex = handleDpadHorizontal(iconIdx, cntX, cntY, map, 1 /increment/);
		if (isRtl && newIndex == NOOP && pageIndex < pageCount - 1) {
		if (!isRtl && newIndex == NOOP && pageIndex < pageCount - 1) {
		newIndex = NEXT_PAGE_LEFT_COLUMN;
		} else if (isRtl && newIndex == NOOP && pageIndex > 0) {
		newIndex = PREVIOUS_PAGE_LEFT_COLUMN;