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

Commit a763a7cc authored by Tony Wickham's avatar Tony Wickham Committed by Automerger Merge Worker
Browse files

Merge "Revert line that could wrongly initialize RecentsView scroll" into... 

Merge "Revert line that could wrongly initialize RecentsView scroll" into tm-dev am: 4ee29221 am: 356eaea1

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



Change-Id: I83c63625c78cc4ce8791ac6190a2e758bd7713b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51ceb5f2 356eaea1

src/com/android/launcher3/PagedView.java

+3 −1
Original line number Diff line number Diff line
@@ -1187,7 +1187,9 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
    }



    public int getScrollForPage(int index) {

        if (!pageScrollsInitialized() || index >= mPageScrolls.length || index < 0) {

        // TODO(b/233112195): Use !pageScrollsInitialized() instead of mPageScrolls == null, once we

        // root cause where we should be using runOnPageScrollsInitialized().

        if (mPageScrolls == null || index >= mPageScrolls.length || index < 0) {

            return 0;

        } else {

            return mPageScrolls[index];