From 692d2109a6702706d24b3b819d115882f7362509 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 8 Oct 2020 18:42:48 -0700 Subject: [PATCH] invalidate itemDecoration on predictedRow focus draw Change-Id: I66c731f00ae1c1292c51ff281957f05fd2d70dfa --- .../android/launcher3/appprediction/PredictionRowView.java | 7 ++----- src/com/android/launcher3/allapps/FloatingHeaderView.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java index dbdfd8d410..37336d180e 100644 --- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java +++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java @@ -148,10 +148,6 @@ public class PredictionRowView extends LinearLayout implements private void updateVisibility() { setVisibility(mPredictionsEnabled ? VISIBLE : GONE); - if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && mLauncher.getAppsView() != null - && mLauncher.getAppsView().getActiveRecyclerView() != null) { - mLauncher.getAppsView().invalidate(); - } } @Override @@ -170,6 +166,7 @@ public class PredictionRowView extends LinearLayout implements } mDecorationHandler.onDraw(canvas); mDecorationHandler.onFocusDraw(canvas, getFocusedChild()); + mLauncher.getAppsView().getActiveRecyclerView().invalidateItemDecorations(); } mFocusHelper.draw(canvas); super.dispatchDraw(canvas); @@ -184,7 +181,7 @@ public class PredictionRowView extends LinearLayout implements @Override public boolean shouldDraw() { - return getVisibility() != GONE; + return getVisibility() == VISIBLE; } @Override diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java index 4bb6a00dd0..813db7d0a0 100644 --- a/src/com/android/launcher3/allapps/FloatingHeaderView.java +++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java @@ -200,7 +200,7 @@ public class FloatingHeaderView extends LinearLayout implements public View getFocusedChild() { if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) { for (FloatingHeaderRow row : mAllRows) { - if (row.hasVisibleContent()) { + if (row.hasVisibleContent() && row.shouldDraw()) { return row.getFocusedChild(); } }