Merge "Avoid drawing tall header when scrolling search results" into sc-dev am: 3350508bb6 am: 02567591a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14661228

Change-Id: Ide2c03f83d3ec82d927e5d312f1c2129524d3ed1
This commit is contained in:
TreeHugger Robot
2021-05-21 18:33:13 +00:00
committed by Automerger Merge Worker
@@ -298,7 +298,7 @@ public class FloatingHeaderView extends LinearLayout implements
@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()));