diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-15 17:47:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-15 17:47:50 +0000 |
| commit | c14adabe99aa120dc2e9cef64b4553f757f3086f (patch) | |
| tree | 15579287a48e653fd0d3a18021eca622d0980a27 /quickstep | |
| parent | ff102be52b8cfab5fdc682117949418f634a198b (diff) | |
| parent | eb701c636095791d6a6171836c0837a2dad7f02b (diff) | |
| download | android_packages_apps_Trebuchet-c14adabe99aa120dc2e9cef64b4553f757f3086f.tar.gz android_packages_apps_Trebuchet-c14adabe99aa120dc2e9cef64b4553f757f3086f.tar.bz2 android_packages_apps_Trebuchet-c14adabe99aa120dc2e9cef64b4553f757f3086f.zip | |
Merge "Scrolling on the most recent task upon Overview start" into ub-launcher3-edmonton
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/src/com/android/quickstep/views/RecentsView.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index a8e38a1ab..ad85d9ed4 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -21,8 +21,8 @@ import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.ACCEL_2; import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; import static com.android.launcher3.anim.Interpolators.LINEAR; -import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId; import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW; +import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId; import android.animation.Animator; import android.animation.AnimatorSet; @@ -1038,14 +1038,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl } updateClearAllButtonAlpha(); - 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) { + if (mShowEmptyMessage && hasValidSize && mEmptyTextLayout == null) { int availableWidth = mLastMeasureSize.x - mEmptyMessagePadding - mEmptyMessagePadding; mEmptyTextLayout = StaticLayout.Builder.obtain(mEmptyMessage, 0, mEmptyMessage.length(), mEmptyMessagePaint, availableWidth) @@ -1072,7 +1065,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl mTempRect.set(mInsets.left + getPaddingLeft(), mInsets.top + getPaddingTop(), mInsets.right + getPaddingRight(), mInsets.bottom + getPaddingBottom()); canvas.save(); - canvas.translate((mTempRect.left - mTempRect.right) / 2, + canvas.translate(getScrollX() + (mTempRect.left - mTempRect.right) / 2, (mTempRect.top - mTempRect.bottom) / 2); mEmptyIcon.draw(canvas); canvas.translate(mEmptyMessagePadding, |