diff --git a/src/com/android/settings/dream/DreamAdapter.java b/src/com/android/settings/dream/DreamAdapter.java index 8e487d4da3e..154181dca4a 100644 --- a/src/com/android/settings/dream/DreamAdapter.java +++ b/src/com/android/settings/dream/DreamAdapter.java @@ -16,6 +16,7 @@ package com.android.settings.dream; +import android.annotation.LayoutRes; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.VectorDrawable; @@ -40,6 +41,7 @@ import java.util.List; */ public class DreamAdapter extends RecyclerView.Adapter { private final List mItemList; + private final @LayoutRes int mLayoutRes; private int mLastSelectedPos = -1; /** @@ -116,15 +118,16 @@ public class DreamAdapter extends RecyclerView.Adapter } } - public DreamAdapter(List itemList) { + public DreamAdapter(@LayoutRes int layoutRes, List itemList) { mItemList = itemList; + mLayoutRes = layoutRes; } @NonNull @Override public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) { View view = LayoutInflater.from(viewGroup.getContext()) - .inflate(R.layout.dream_preference_layout, viewGroup, false); + .inflate(mLayoutRes, viewGroup, false); return new DreamViewHolder(view, viewGroup.getContext()); } diff --git a/src/com/android/settings/dream/DreamPickerController.java b/src/com/android/settings/dream/DreamPickerController.java index af8c3645251..201d6de7f00 100644 --- a/src/com/android/settings/dream/DreamPickerController.java +++ b/src/com/android/settings/dream/DreamPickerController.java @@ -74,9 +74,10 @@ public class DreamPickerController extends BasePreferenceController { public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - mAdapter = new DreamAdapter(mDreamInfos.stream() - .map(DreamItem::new) - .collect(Collectors.toList())); + mAdapter = new DreamAdapter(R.layout.dream_preference_layout, + mDreamInfos.stream() + .map(DreamItem::new) + .collect(Collectors.toList())); final LayoutPreference pref = screen.findPreference(getPreferenceKey()); if (pref == null) {