diff --git a/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt b/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt index 9f3c017fbe..99437709de 100644 --- a/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt +++ b/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt @@ -91,6 +91,9 @@ class AddDesktopButton @JvmOverloads constructor(context: Context, attrs: Attrib } } + protected fun getScrollAdjustment(showAsGrid: Boolean): Int = + if (showAsGrid) gridTranslationX.toInt() else 0 + private fun getBorderBounds(bounds: Rect) { bounds.set(0, 0, width, height) val outlinePadding = diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index c5a76cb067..11e65722f1 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -6243,8 +6243,8 @@ public abstract class RecentsView< int addDesktopButtonIndex = indexOfChild(mAddDesktopButton); if (addDesktopButtonIndex != -1 && addDesktopButtonIndex < outPageScrolls.length) { outPageScrolls[addDesktopButtonIndex] = - newPageScrolls[addDesktopButtonIndex] + Math.round( - mAddDesktopButton.getGridTranslationX()); + newPageScrolls[addDesktopButtonIndex] + mAddDesktopButton.getScrollAdjustment( + showAsGrid); } int lastTaskScroll = getLastTaskScroll(clearAllScroll, clearAllWidth);