Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b063294e authored by Andras Kloczl's avatar Andras Kloczl
Browse files

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
parent 144b16bb

src/com/android/launcher3/PagedView.java

+2 −7
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
        } 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 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
            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);

    }



    /**