commit a60a34399d1509bf6cf5a5cca01632cfc32f4cfc
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Apr 19 20:27:09 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Apr 19 20:27:09 2018 +0000
tree 2f0e3055c0435274cb1100f692463da5a287e16c
parent d1cf445878369af5aaaab3ddeb1d3d0e3ca936fb
parent e8cf0ae61f277873f16def76d16f3107cb3ea49a

[automerger] Centering empty icon. am: e8cf0ae61f

Change-Id: I17518dec095afa4055ee1e6180add0f5eb95d78b

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 29d999d..5e55590 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(),