| commit | e61ad56098a368c1c0bd052bbdc5358cbb8b7855 | [log] [tgz] |
|---|---|---|
| author | Uwais Ashraf <uwaisashraf@google.com> | Mon Sep 25 15:03:55 2023 +0000 |
| committer | Uwais Ashraf <uwaisashraf@google.com> | Wed Oct 04 14:57:11 2023 +0000 |
| tree | e9898dae72183d6274a8449ba3eeadaaeb15bee9 | |
| parent | 5bec1164b90dd3846fc0da8db89d2a9f1a0db0d7 [diff] |
Align empty recents message+icon to center of View. Seems like it was previously aligned to center of task which doesn't always look good. Screenshots: Handheld before - https://screenshot.googleplex.com/6GmqhTjUhUpwwBs Handheld after - https://screenshot.googleplex.com/3QMYCQaS6USMQYy Tablet before - https://screenshot.googleplex.com/7tsERFGVsa6QSNY Tablet after - https://screenshot.googleplex.com/8itDgQ2jDTHk463 Unfolded before - https://screenshot.googleplex.com/AJaqC9LqP2Dwfz2 Unfolded after - https://screenshot.googleplex.com/8aaa7ZhemqHXHRh Fix: 299100892 Test: OverviewEmptyMessageImageTest and observed on tablet, handheld and unfolded. Change-Id: I538d25e5a98e25351e71718de3ca572fd00438ad
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 825c0ae..18d1e9d 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -4980,12 +4980,13 @@ protected void maybeDrawEmptyMessage(Canvas canvas) { if (mShowEmptyMessage && mEmptyTextLayout != null) { - // Offset to center in the visible (non-padded) part of RecentsView - mTempRect.set(mInsets.left + getPaddingLeft(), mInsets.top + getPaddingTop(), - mInsets.right + getPaddingRight(), mInsets.bottom + getPaddingBottom()); + // Offsets icon and text up so that the vertical center of screen (accounting for + // insets) is between icon and text. + int offset = (mEmptyIcon.getIntrinsicHeight() + mEmptyMessagePadding) / 2; + canvas.save(); - canvas.translate(getScrollX() + (mTempRect.left - mTempRect.right) / 2, - (mTempRect.top - mTempRect.bottom) / 2); + canvas.translate(getScrollX() + (mInsets.left - mInsets.right) / 2f, + (mInsets.top - mInsets.bottom) / 2f - offset); mEmptyIcon.draw(canvas); canvas.translate(mEmptyMessagePadding, mEmptyIcon.getBounds().bottom + mEmptyMessagePadding);