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

Commit 845ab22d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ib32b307cae09084b90f34bfb313799e9c32ddc8e
parents bf3221b5 4b878f53

src/com/android/launcher3/PagedView.java

+2 −7
Original line number Original line 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) {

        } else if (focus == View.FOCUS_RIGHT) {

            nextPage = currentPage + panelCount;

            nextPage = currentPage + panelCount;

        } else {

        } else {

            // no neighbours to those direction

            // no neighbours to other directions

            return new IntSet();

            return new IntSet();

        }

        }

        nextPage = validateNewPage(nextPage);

        nextPage = validateNewPage(nextPage);
@@ -362,12 +362,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
            return new IntSet();

            return new IntSet();

        }

        }





        int pageCount = getPageCount();

        return getPageIndices(nextPage);

        IntSet neighbourIndices = new IntSet();

        for (int page = nextPage; page < nextPage + panelCount && page < pageCount; page++) {

            neighbourIndices.add(page);

        }

        return neighbourIndices;

    }

    }





    /**

    /**