commit feba2f800e8fa9e901ad200f397c3bbf44a28b41
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Sep 29 23:12:14 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Sep 29 23:12:14 2021 +0000
tree d2c7af368cd0a4591b030d73e7932329625037d1
parent 455d3d24a4df7f64d48e11a8cd5d082b2437be45
parent a97031a7e8d0421faecae979159229b3b9d853af

Snap for 7779164 from a97031a7e8d0421faecae979159229b3b9d853af to sc-v2-release

Change-Id: I326ea6c86c64ca5be16a5ee5304cb0b751ca6ee4

src/com/android/settings/intelligence/search/car/CarSearchFragment.java

diff --git a/src/com/android/settings/intelligence/search/car/CarSearchFragment.java b/src/com/android/settings/intelligence/search/car/CarSearchFragment.java
index 47e4a21..a326eea 100644
--- a/src/com/android/settings/intelligence/search/car/CarSearchFragment.java
+++ b/src/com/android/settings/intelligence/search/car/CarSearchFragment.java
@@ -37,11 +37,11 @@
 import androidx.annotation.NonNull;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.car.ui.imewidescreen.CarUiImeSearchListItem;
 import com.android.car.ui.preference.PreferenceFragment;
 import com.android.car.ui.recyclerview.CarUiContentListItem;
+import com.android.car.ui.recyclerview.CarUiRecyclerView;
 import com.android.car.ui.toolbar.MenuItem;
 import com.android.car.ui.toolbar.NavButtonMode;
 import com.android.car.ui.toolbar.SearchConfig;
@@ -70,7 +70,7 @@
     private SearchFeatureProvider mSearchFeatureProvider;
 
     private ToolbarController mToolbar;
-    private RecyclerView mRecyclerView;
+    private CarUiRecyclerView mRecyclerView;
 
     private String mQuery;
     private boolean mShowingSavedQuery;
@@ -78,14 +78,19 @@
     private CarSearchResultsAdapter mSearchAdapter;
     private CarSavedQueryController mSavedQueryController;
 
-    private final RecyclerView.OnScrollListener mScrollListener =
-            new RecyclerView.OnScrollListener() {
+    private final CarUiRecyclerView.OnScrollListener mScrollListener =
+            new CarUiRecyclerView.OnScrollListener() {
                 @Override
-                public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                public void onScrolled(@NonNull CarUiRecyclerView recyclerView, int dx, int dy) {
                     if (dy != 0) {
                         hideKeyboard();
                     }
                 }
+
+                @Override
+                public void onScrollStateChanged(@NonNull CarUiRecyclerView recyclerView,
+                                                          int newState) {}
+
             };
 
     @Override
@@ -142,7 +147,7 @@
             mToolbar.setShowMenuItemsWhileSearching(true);
             mToolbar.setSearchQuery(mQuery);
         }
-        mRecyclerView = getListView();
+        mRecyclerView = getCarUiRecyclerView();
         if (mRecyclerView != null) {
             mRecyclerView.setAdapter(mSearchAdapter);
             mRecyclerView.addOnScrollListener(mScrollListener);
@@ -339,8 +344,8 @@
             }
         }
 
-        if (mRecyclerView != null && !mRecyclerView.hasFocus()) {
-            mRecyclerView.requestFocus();
+        if (mRecyclerView != null && !mRecyclerView.getView().hasFocus()) {
+            mRecyclerView.getView().requestFocus();
         }
     }
 }