commit 5ffc39c7c7a400f532daeedf95836b82fdd4bc87
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 03 13:44:45 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 03 13:44:45 2021 +0000
tree 1829b702404f825bfd025dde008e9f648ef1829e
parent b77c857600872ab1fa6afbdeeb57f7d04d823147
parent 845ab22dae51f9f40d197ec6f7912b78e8b6ef62

Merge "Follow up CL for controller navigation fix" into sc-v2-dev am: 4b878f5318 am: 845ab22dae

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15453920

Change-Id: I6d0d7c048f73b6615e021fd464edee2ecc02b5a1

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 242e3e3..eb3f94c 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -353,7 +353,7 @@
         } else if (focus == View.FOCUS_RIGHT) {
             nextPage = currentPage + panelCount;
         } else {
-            // no neighbours to those direction
+            // no neighbours to other directions
             return new IntSet();
         }
         nextPage = validateNewPage(nextPage);
@@ -362,12 +362,7 @@
             return new IntSet();
         }
 
-        int pageCount = getPageCount();
-        IntSet neighbourIndices = new IntSet();
-        for (int page = nextPage; page < nextPage + panelCount && page < pageCount; page++) {
-            neighbourIndices.add(page);
-        }
-        return neighbourIndices;
+        return getPageIndices(nextPage);
     }
 
     /**