PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix regression where keyboard couldn\'t switch between workspace pages.

Browse Source 
am: c2bc0ef1c3

* commit 'c2bc0ef1c313698fd931fc84ec2f11882c38cdba':
  Fix regression where keyboard couldn't switch between workspace pages.
This commit is contained in:
Tony Wickham
2015-10-20 23:49:58 +00:00
committed by android-build-merger
parent dc4fd457bb c2bc0ef1c3
commit 0b9aec98f4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/util/FocusLogic.java
+3 -3
View File
@@ -48,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;
@@ -91,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;
@@ -99,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;