diff options
| author | 2015-10-10 15:54:20 +0000 | |
|---|---|---|
| committer | 2015-10-10 15:54:20 +0000 | |
| commit | e1b924921a55f46ad9312ee6cd8cdf27d9459c8d (patch) | |
| tree | af304e593446e58b46041fb4ddc66deea6975a50 | |
| parent | 2f6aa4a0e531dfd551e3f8a4d7d6e7303460aa62 (diff) | |
| parent | d20f87dad85a818d6a0f61955d3da925ab1efb40 (diff) | |
Merge "Rename "recyclerView" to "list" fixing some of CTS."
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml index 45cb34db54e0..4019d02da330 100644 --- a/packages/DocumentsUI/res/layout/fragment_directory.xml +++ b/packages/DocumentsUI/res/layout/fragment_directory.xml @@ -68,7 +68,7 @@ android:layout_height="match_parent"> <android.support.v7.widget.RecyclerView - android:id="@+id/recyclerView" + android:id="@+id/list" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index 2fe829f266ba..94fce593c573 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java @@ -220,7 +220,7 @@ public class DirectoryFragment extends Fragment { mEmptyView = view.findViewById(android.R.id.empty); - mRecView = (RecyclerView) view.findViewById(R.id.recyclerView); + mRecView = (RecyclerView) view.findViewById(R.id.list); mRecView.setRecyclerListener( new RecyclerListener() { @Override diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java index cf682fa508fc..bb6c3b5ecc33 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java @@ -83,7 +83,7 @@ public class RecentsCreateFragment extends Fragment { final View view = inflater.inflate(R.layout.fragment_directory, container, false); - mRecView = (RecyclerView) view.findViewById(R.id.recyclerView); + mRecView = (RecyclerView) view.findViewById(R.id.list); mRecView.setLayoutManager(new LinearLayoutManager(getContext())); mRecView.addOnItemTouchListener(mItemListener); |