summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-07-18 23:18:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-18 23:18:09 +0000
commitcbaecd0f355fbb534bc221968cca74b754cb66bc (patch)
tree72904684a43a603b9daee879c286a752fb0d0742
parent860a6ce6d127748238283352afb017d9008c2af1 (diff)
parent9c36b83519804000a3d83e141c3ce7455828b4db (diff)
downloadframeworks_base-cbaecd0f355fbb534bc221968cca74b754cb66bc.zip
frameworks_base-cbaecd0f355fbb534bc221968cca74b754cb66bc.tar.gz
frameworks_base-cbaecd0f355fbb534bc221968cca74b754cb66bc.tar.bz2
am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs
* commit '9c36b83519804000a3d83e141c3ce7455828b4db': docs: Fixed RecyclerView example. Bug: 15973665
-rw-r--r--docs/html/preview/material/ui-widgets.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/preview/material/ui-widgets.jd b/docs/html/preview/material/ui-widgets.jd
index 2266815..2d29420 100644
--- a/docs/html/preview/material/ui-widgets.jd
+++ b/docs/html/preview/material/ui-widgets.jd
@@ -132,7 +132,7 @@ public class MyAdapter extends RecyclerView.Adapter&lt;MyAdapter.ViewHolder> {
int viewType) {
// create a new view
View v = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.my_text_view, null);
+ .inflate(R.layout.my_text_view, parent);
// set the view's size, margins, paddings and layout parameters
...
ViewHolder vh = new ViewHolder(v);