commit ee3c67cff0f742e76d26a80b1282dca1b37aa8f4
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Apr 19 23:30:48 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Apr 19 23:30:48 2018 +0000
tree 3d65cab20ea98e2beed284203734e800a53321ce
parent a60a34399d1509bf6cf5a5cca01632cfc32f4cfc
parent 7d2e40912eb7007e8378f106556b4cbcbc24d661

[automerger] Updating the task swipe-down UI am: 7d2e40912e

Change-Id: I4fe2c0ca637b7952c78883a1517656b441badde5

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f369016..6a2df0b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -945,7 +945,14 @@
             mEmptyTextLayout = null;
         }
 
-        if (mShowEmptyMessage && hasValidSize && mEmptyTextLayout == null) {
+        if (!mShowEmptyMessage) return;
+
+        // The icon needs to be centered. Need to scoll to horizontal 0 because with Clear-All
+        // space on the right, it's not guaranteed that after deleting all tasks, the horizontal
+        // scroll position will be zero.
+        scrollTo(0, 0);
+
+        if (hasValidSize && mEmptyTextLayout == null) {
             mLastMeasureSize.set(getWidth(), getHeight());
             int availableWidth = mLastMeasureSize.x - mEmptyMessagePadding - mEmptyMessagePadding;
             mEmptyTextLayout = StaticLayout.Builder.obtain(mEmptyMessage, 0, mEmptyMessage.length(),