commit cc6d5007b7de5c0afeedf082a23808dd5d9101f8
author Brandon Dayauon <brdayauon@google.com> Tue Jun 25 17:55:16 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 25 17:55:16 2024 +0000
tree 112fb002a074290adc6573063e24aad74a4c0b25
parent 21d4a9cdbc1f4b124b4e5fc4abc962ceae33aa7d
parent e770f10d2a6a047c1ad7b1061f57c388dec4f913

Merge "Fix NPE when locking private space in taskbar allapps." into main

src/com/android/launcher3/allapps/AllAppsRecyclerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index ba34f59..2a47222 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -305,9 +305,7 @@
 
     @Override
     public int getScrollBarTop() {
-        return ActivityContext.lookupContext(getContext()).getAppsView().isSearchSupported()
-                ? getResources().getDimensionPixelOffset(R.dimen.all_apps_header_top_padding)
-                : 0;
+        return getResources().getDimensionPixelOffset(R.dimen.all_apps_header_top_padding);
     }
 
     @Override