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

Commit 3116dc91 authored by Samuel Fufa's avatar Samuel Fufa
Browse files

Resolve search scroll hightlight issue 

After getting the index of the first item that should be highlighted, Section decorator should not assume getChildAt(index) will return item at position. Instead use findViewHolderForAdapterPosition.

Bug: 170665892
Change-Id: Id81d021bde8868184013e8d51e49af7842b64125
parent a204de7d

res/layout/search_result_settings_row.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/search_line_spacing"

            android:maxLines="1"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="@dimen/search_hero_title_size" />

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

+1 −2
Original line number Diff line number Diff line
@@ -184,8 +184,7 @@ public class AllAppsGridAdapter extends 
                    || viewType == VIEW_TYPE_SEARCH_THUMBNAIL

                    || viewType == VIEW_TYPE_SEARCH_ICON_ROW

                    || viewType == VIEW_TYPE_SEARCH_ICON

                    || viewType == VIEW_TYPE_SEARCH_SUGGEST

                    || viewType == VIEW_TYPE_SEARCH_WIDGET_LIVE;

                    || viewType == VIEW_TYPE_SEARCH_SUGGEST;

        }

    }

src/com/android/launcher3/allapps/AllAppsSectionDecorator.java

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration { 
                    mAppsView.getActiveRecyclerView().getLayoutManager();

            if (layoutManager.findFirstVisibleItemPosition() <= index

                    && index < parent.getChildCount()) {

                decorationHandler.onFocusDraw(c, parent.getChildAt(index));

                RecyclerView.ViewHolder vh = parent.findViewHolderForAdapterPosition(index);

                if (vh != null) decorationHandler.onFocusDraw(c, vh.itemView);

            }

        }

        decorationHandler.reset();