From d184971cceeae4376fa3c85be971d71e1a7057ad Mon Sep 17 00:00:00 2001
From: Mark Renouf <mrenouf@google.com>
Date: Tue, 15 Dec 2020 22:42:34 -0500
Subject: [PATCH] Fix restore of RecyclerView scroll position

Always subtract a delta to return to the origin.

Bug: 175740554
Fix: 175740554
Test: manual
Change-Id: I2bbce8f12eed34f2fe524784ea53cf42499ab690
---
 .../com/android/internal/view/RecyclerViewCaptureHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/view/RecyclerViewCaptureHelper.java b/core/java/com/android/internal/view/RecyclerViewCaptureHelper.java
index 461e116685097..934241acd851c 100644
--- a/core/java/com/android/internal/view/RecyclerViewCaptureHelper.java
+++ b/core/java/com/android/internal/view/RecyclerViewCaptureHelper.java
@@ -189,7 +189,7 @@ public class RecyclerViewCaptureHelper implements ScrollCaptureViewHelper<ViewGr
     @Override
     public void onPrepareForEnd(@NonNull ViewGroup view) {
         // Restore original position and state
-        view.scrollBy(0, mScrollDelta);
+        view.scrollBy(0, -mScrollDelta);
         view.setOverScrollMode(mOverScrollMode);
         view.setVerticalScrollBarEnabled(mScrollBarWasEnabled);
         if (DISABLE_ANIMATORS) {