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

Commit da6da472 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "scroll capture: Recover gracefully when anchor view is lost" into... 

Merge "scroll capture: Recover gracefully when anchor view is lost" into udc-dev am: 4d859e7b am: 5a0e8af0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23058626



Change-Id: I54369ff0558fc7466432d6d5cfe4173f00e0058a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 529a0cae 5a0e8af0

core/java/com/android/internal/view/RecyclerViewCaptureHelper.java

+7 −0
Original line number Diff line number Diff line
@@ -105,6 +105,13 @@ public class RecyclerViewCaptureHelper implements ScrollCaptureViewHelper<ViewGr 
        }



        if (recyclerView.requestChildRectangleOnScreen(anchor, input, true)) {

            if (anchor.getParent() == null) {

                // BUG(b/239050369): Check if the tracked anchor view is still attached.

                Log.w(TAG, "Bug: anchor view " + anchor + " is detached after scrolling");

                resultConsumer.accept(result); // empty result

                return;

            }



            int scrolled = prevAnchorTop - anchor.getTop(); // inverse of movement

            mScrollDelta += scrolled; // view.top-- is equivalent to parent.scrollY++

            result.scrollDelta = mScrollDelta;