| commit | fd9f5ea3b57949fcaedb3511ad0b1c3596941f7e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 21 19:19:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 21 19:19:09 2021 +0000 |
| tree | 7ab6e11448e40e3c1c1112876d5d4ac53dcee6de | |
| parent | 82e646aa9bd4782e06e4343bc68f16c1465b1af7 [diff] | |
| parent | 2f7f788304e1e7a8ccec838eac5693b189a174dd [diff] |
Merge "Avoid drawing tall header when scrolling search results" into sc-dev am: 3350508bb6 am: 02567591a5 am: 2f7f788304 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14661228 Change-Id: If88c81c4ab35ae6f6cb6b582c2a2cf4a93e555de
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java index af7896a..a0c598a 100644 --- a/src/com/android/launcher3/allapps/FloatingHeaderView.java +++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -298,7 +298,7 @@ @Override protected void dispatchDraw(Canvas canvas) { - if (mHeaderCollapsed && mTabLayout.getVisibility() == VISIBLE + if (mHeaderCollapsed && !mCollapsed && mTabLayout.getVisibility() == VISIBLE && mHeaderColor != Color.TRANSPARENT) { mBGPaint.setColor(mHeaderColor); mBGPaint.setAlpha((int) (255 * mHeaderAnimator.getAnimatedFraction()));