Follow up CL for controller navigation fix
Fixing unresolved comment: http://shortn/_YCaiPNApNc
Test: manual test with a game controller, check on both normal and two panel home
Bug: 187205980
Change-Id: I8cae48effcce852c85273f16d1107dec90ff6f51
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);
}
/**