commit 0b9aec98f4a71bb3ecfe7ecd5270aae9be38e39d
author Tony Wickham <twickham@google.com> Tue Oct 20 23:49:58 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 20 23:49:58 2015 +0000
tree 38fc064efbcb66feba101d33d09471f281f7a1e2
parent dc4fd457bbac2961f09e60d6e864323eb53a6a17
parent c2bc0ef1c313698fd931fc84ec2f11882c38cdba

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

* commit 'c2bc0ef1c313698fd931fc84ec2f11882c38cdba':
  Fix regression where keyboard couldn't switch between workspace pages.

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

diff --git a/src/com/android/launcher3/util/FocusLogic.java b/src/com/android/launcher3/util/FocusLogic.java
index 1c6efbc..27ce3f1 100644
--- a/src/com/android/launcher3/util/FocusLogic.java
+++ b/src/com/android/launcher3/util/FocusLogic.java
@@ -48,7 +48,7 @@
     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 @@
         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 @@
                 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;