Shade: Reload app drawer search bar elevation controller on view change

amirzaidi · Jun 5, 2020 · 9339b5c · 9339b5c
1 parent 1b3a70b
commit 9339b5c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/shade/src/amirz/shade/allapps/AllAppsView.java b/shade/src/amirz/shade/allapps/AllAppsView.java
@@ -15,6 +15,7 @@
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsContainerView;
 
+import amirz.shade.search.AllAppsSearchBackground;
 import amirz.shade.search.EditText;
 import amirz.shade.util.AppReloader;
 
@@ -102,5 +103,9 @@ protected EdgeEffect createEdgeEffect(@NonNull RecyclerView view, int direction)
     public void setupHeader() {
         super.setupHeader();
         getFloatingHeaderView().reset(false);
+
+        AllAppsSearchBackground bg = findViewById(R.id.fallback_search_view);
+        bg.setShadowAlpha(0);
+        addElevationController(bg.getElevationController());
     }
 }
diff --git a/shade/src/amirz/shade/search/AllAppsQsb.java b/shade/src/amirz/shade/search/AllAppsQsb.java
@@ -288,9 +288,6 @@ public void initialize(AllAppsContainerView appsView) {
         mSearchBarController.initialize(
                 new HiddenAppsSearchAlgorithm(mLauncher, appsView.getAppsStore()),
                 mFallbackSearchViewText, mLauncher, this);
-
-        appsView.setRecyclerViewVerticalFadingEdgeEnabled(true);
-        appsView.addElevationController(mFallbackSearchView.getAlphaUpdater());
     }
 
     @Override

diff --git a/shade/src/amirz/shade/search/AllAppsSearchBackground.java b/shade/src/amirz/shade/search/AllAppsSearchBackground.java
@@ -41,6 +41,13 @@ public class AllAppsSearchBackground extends FrameLayout implements View.OnClick
     private int mColor;
     private int mShadowAlpha;
 
+    private RecyclerView.OnScrollListener mOnScrollListener = new RecyclerView.OnScrollListener() {
+        @Override
+        public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+            setShadowAlpha(((BaseRecyclerView) recyclerView).getCurrentScrollY());
+        }
+    };
+
     public AllAppsSearchBackground(@NonNull Context context) {
         this(context, null);
     }
@@ -176,17 +183,11 @@ public void setRadius(float radius) {
         }
     }
 
-    public RecyclerView.OnScrollListener getAlphaUpdater() {
-        setAlpha(0);
-        return new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                setAlpha(((BaseRecyclerView) recyclerView).getCurrentScrollY());
-            }
-        };
+    public RecyclerView.OnScrollListener getElevationController() {
+        return mOnScrollListener;
     }
 
-    private void setAlpha(int newAlpha) {
+    public void setShadowAlpha(int newAlpha) {
         int normalizedAlpha = Utilities.boundToRange(newAlpha, 0, 255);
         if (mShadowAlpha != normalizedAlpha) {
             mShadowAlpha = normalizedAlpha;