commit 1d76159de4dc626bc35fb4dc1a969d07508b6dc9
author Sunny Goyal <sunnygoyal@google.com> Fri Oct 28 12:25:04 2022 -0700
committer Sunny Goyal <sunnygoyal@google.com> Fri Oct 28 12:25:04 2022 -0700
tree 5a746f4fd6175b3b2038daf4e1bdff417fef3be6
parent 391280818393ed503417357ea7d0959f288e9f5f

Fixing flakyness in widget tests

For some predicted app widgets, the layout happens before the recyclerView
can layout completely (because of preview layout invalidation), causing the
scroll cache to get in a wrong state.
Checking for scroll cache validity everytime instead of only during
data changes

Bug: 255797215
Test: Verified by hardcoing the chrome widget as predicted widget
Change-Id: Id2c68560baa45de89e08c53bdb9ee6820eab68c4

src/com/android/launcher3/util/ScrollableLayoutManager.java

diff --git a/src/com/android/launcher3/util/ScrollableLayoutManager.java b/src/com/android/launcher3/util/ScrollableLayoutManager.java
index 17eaefd..9bc4ddc 100644
--- a/src/com/android/launcher3/util/ScrollableLayoutManager.java
+++ b/src/com/android/launcher3/util/ScrollableLayoutManager.java
@@ -44,8 +44,6 @@
      * whereas widgets will have strictly increasing values
      *     sample values: 0, 10, 50, 60, 110
      */
-
-    //
     private int[] mTotalHeightCache = new int[1];
     private int mLastValidHeightIndex = 0;
 
@@ -62,16 +60,23 @@
     @Override
     public void layoutDecorated(@NonNull View child, int left, int top, int right, int bottom) {
         super.layoutDecorated(child, left, top, right, bottom);
-        mCachedSizes.put(
-                mRv.getChildViewHolder(child).getItemViewType(), child.getMeasuredHeight());
+        updateCachedSize(child);
     }
 
     @Override
     public void layoutDecoratedWithMargins(@NonNull View child, int left, int top, int right,
             int bottom) {
         super.layoutDecoratedWithMargins(child, left, top, right, bottom);
-        mCachedSizes.put(
-                mRv.getChildViewHolder(child).getItemViewType(), child.getMeasuredHeight());
+        updateCachedSize(child);
+    }
+
+    private void updateCachedSize(@NonNull View child) {
+        int viewType = mRv.getChildViewHolder(child).getItemViewType();
+        int size = child.getMeasuredHeight();
+        if (mCachedSizes.get(viewType, -1) != size) {
+            invalidateScrollCache();
+        }
+        mCachedSizes.put(viewType, size);
     }
 
     @Override