commit 750d537acf9f76f8dee18bf256b8ebbac4c460bc
author Andrew Solovay <asolovay@google.com> Wed Jun 04 17:43:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 04 17:43:24 2014 +0000
tree ba830ab2df3e7e3b0f190715b89a631671b84e4a
parent d53f1bd0e4a00677c12d38cfd525b5592d352fd7
parent c2086e09df1fa5b0f147f9474a9dd924f487468f

am c2086e09: am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs

* commit 'c2086e09df1fa5b0f147f9474a9dd924f487468f':
  docs: Fixed error in code sample.

docs/html/training/contacts-provider/retrieve-names.jd

diff --git a/docs/html/training/contacts-provider/retrieve-names.jd b/docs/html/training/contacts-provider/retrieve-names.jd
index b034a6a..7106889a 100644
--- a/docs/html/training/contacts-provider/retrieve-names.jd
+++ b/docs/html/training/contacts-provider/retrieve-names.jd
@@ -102,9 +102,9 @@
 <p>
     To display the search results in a {@link android.widget.ListView}, you need a main layout file
     that defines the entire UI including the {@link android.widget.ListView}, and an item layout
-    file that defines one line of the {@link android.widget.ListView}. For example, you can define
-    the main layout file <code>res/layout/contacts_list_view.xml</code> that contains the
-    following XML:
+    file that defines one line of the {@link android.widget.ListView}. For example, you could create
+    the main layout file <code>res/layout/contacts_list_view.xml</code> with
+    the following XML:
 </p>
 <pre>
 &lt;?xml version="1.0" encoding="utf-8"?&gt;
@@ -250,7 +250,8 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         // Inflate the fragment layout
-        return inflater.inflate(R.layout.contacts_list_layout, container, false);
+        return inflater.inflate(R.layout.contact_list_fragment,
+            container, false);
     }
 </pre>
 <h3 id="DefineAdapter">Set up the CursorAdapter for the ListView</h3>
@@ -268,7 +269,8 @@
         super.onActivityCreated(savedInstanceState);
         ...
         // Gets the ListView from the View list of the parent activity
-        mContactsList = (ListView) getActivity().findViewById(R.layout.contact_list_view);
+        mContactsList =
+            (ListView) getActivity().findViewById(R.layout.contact_list_view);
         // Gets a CursorAdapter
         mCursorAdapter = new SimpleCursorAdapter(
                 getActivity(),