Merge "Only return true in getPageScrolls if it actually changes" into sc-dev
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index e0d2702..790c655 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3241,8 +3241,8 @@
@Override
protected boolean getPageScrolls(int[] outPageScrolls, boolean layoutChildren,
ComputePageScrollsLogic scrollLogic) {
- boolean pageScrollChanged = super.getPageScrolls(outPageScrolls, layoutChildren,
- scrollLogic);
+ int[] newPageScrolls = new int[outPageScrolls.length];
+ super.getPageScrolls(newPageScrolls, layoutChildren, scrollLogic);
boolean showAsFullscreen = showAsFullscreen();
boolean showAsGrid = showAsGrid();
@@ -3254,6 +3254,7 @@
mClearAllButton.setScrollOffsetPrimary(mIsRtl ? clearAllWidthDiff : -clearAllWidthDiff);
}
+ boolean pageScrollChanged = false;
final int childCount = getChildCount();
for (int i = 0; i < childCount; i++) {
View child = getChildAt(i);
@@ -3265,9 +3266,10 @@
showAsGrid);
}
- if (scrollDiff != 0) {
- outPageScrolls[i] += scrollDiff;
+ final int pageScroll = newPageScrolls[i] + (int) scrollDiff;
+ if (outPageScrolls[i] != pageScroll) {
pageScrollChanged = true;
+ outPageScrolls[i] = pageScroll;
}
}
return pageScrollChanged;