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

Commit abd33b38 authored by Stevie Kideckel's avatar Stevie Kideckel
Browse files

Use the LayoutManager as the source of truth for visible positions 

During animations, the view group child may not correspond to the
visible views that appear at the top.

The previous logic is kept in the case that the layout manager returns
null for any reason, which can happen before layout has occurred for the
position.

Fix: 189588014
Test: verified locally
Change-Id: Ie8b5dcef50287e9e90a21f86e30a1ebcbbcba30f
parent a4adcbc8

src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java

+19 −2
Original line number Diff line number Diff line
@@ -154,8 +154,25 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch 
            return -1;

        }



        View child = getChildAt(0);

        int rowIndex = getChildPosition(child);

        int rowIndex = -1;

        View child = null;



        LayoutManager layoutManager = getLayoutManager();

        if (layoutManager instanceof LinearLayoutManager) {

            // Use the LayoutManager as the source of truth for visible positions. During

            // animations, the view group child may not correspond to the visible views that appear

            // at the top.

            rowIndex = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();

            child = layoutManager.findViewByPosition(rowIndex);

        }



        if (child == null) {

            // If the layout manager returns null for any reason, which can happen before layout

            // has occurred for the position, then look at the child of this view as a ViewGroup.

            child = getChildAt(0);

            rowIndex = getChildPosition(child);

        }



        for (int i = 0; i < getChildCount(); i++) {

            View view = getChildAt(i);

            if (view instanceof TableLayout) {