summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorCheryl Potter <cherylpotter@google.com>2015-09-08 22:13:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-08 22:13:22 +0000
commit27a85cca7c001ec47749feb60461081f14b2dfe3 (patch)
tree509353c840203253da9a61aca842b9091d0d8c2b /docs
parentfb4e0323a248c720170e010ea97299bf3f7415d1 (diff)
parentfb53f11515554f618d5888c8137119bcc4f316cb (diff)
downloadframeworks_base-27a85cca7c001ec47749feb60461081f14b2dfe3.zip
frameworks_base-27a85cca7c001ec47749feb60461081f14b2dfe3.tar.gz
frameworks_base-27a85cca7c001ec47749feb60461081f14b2dfe3.tar.bz2
am fb53f115: am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
* commit 'fb53f11515554f618d5888c8137119bcc4f316cb': docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/building-userinfo.jd8
-rw-r--r--docs/html/training/contacts-provider/retrieve-names.jd1
-rw-r--r--docs/html/training/training_toc.cs2
3 files changed, 5 insertions, 6 deletions
diff --git a/docs/html/training/building-userinfo.jd b/docs/html/training/building-userinfo.jd
index f9d77f7..40e5b94 100644
--- a/docs/html/training/building-userinfo.jd
+++ b/docs/html/training/building-userinfo.jd
@@ -1,9 +1,9 @@
-page.title=Building Apps with User Info &amp; Location
+page.title=Building Apps with Contacts &amp; Sign-In
page.trainingcourse=true
@jd:body
-<p>These classes teach you how to add user personalization to your app. Some of the ways
-you can do this is by identifying users, providing
-information that's relevant to them, and providing information about the world around them.</p> \ No newline at end of file
+<p>These lessons teach you how to include contact information and authenticate users with the same
+credentials they use for Google. These features allow your app to connect users with people they
+care about and provide a personalized experience without creating new user accounts.</p>
diff --git a/docs/html/training/contacts-provider/retrieve-names.jd b/docs/html/training/contacts-provider/retrieve-names.jd
index 7106889..d97b81b 100644
--- a/docs/html/training/contacts-provider/retrieve-names.jd
+++ b/docs/html/training/contacts-provider/retrieve-names.jd
@@ -731,7 +731,6 @@ public class ContactsFragment extends Fragment implements
Define ListView and item layouts.
</li>
<li>
- <li>
Define a Fragment that displays the list of contacts.
</li>
<li>
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index 7cffdd8..2963345 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -811,7 +811,7 @@ include the action bar on devices running Android 2.1 or higher."
<div class="nav-section-header">
<a href="<?cs var:toroot ?>training/building-userinfo.html">
<span class="small">Building Apps with</span><br/>
- User Info &amp; Sign-In
+ Contacts &amp; Sign-In
</a>
</div>
<ul>