diff options
| -rw-r--r-- | src/com/android/settings/intelligence/search/car/CarSearchFragment.java | 21 |
1 files changed, 13 insertions, 8 deletions
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 android.view.inputmethod.InputMethodManager; 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 @@ public class CarSearchFragment extends PreferenceFragment implements private SearchFeatureProvider mSearchFeatureProvider; private ToolbarController mToolbar; - private RecyclerView mRecyclerView; + private CarUiRecyclerView mRecyclerView; private String mQuery; private boolean mShowingSavedQuery; @@ -78,14 +78,19 @@ public class CarSearchFragment extends PreferenceFragment implements 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 @@ public class CarSearchFragment extends PreferenceFragment implements mToolbar.setShowMenuItemsWhileSearching(true); mToolbar.setSearchQuery(mQuery); } - mRecyclerView = getListView(); + mRecyclerView = getCarUiRecyclerView(); if (mRecyclerView != null) { mRecyclerView.setAdapter(mSearchAdapter); mRecyclerView.addOnScrollListener(mScrollListener); @@ -339,8 +344,8 @@ public class CarSearchFragment extends PreferenceFragment implements } } - if (mRecyclerView != null && !mRecyclerView.hasFocus()) { - mRecyclerView.requestFocus(); + if (mRecyclerView != null && !mRecyclerView.getView().hasFocus()) { + mRecyclerView.getView().requestFocus(); } } } |