summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-03-12 09:25:22 -0700
committerScott Main <smain@google.com>2013-03-12 09:25:22 -0700
commita15afd2bc4b103146497b521c09c73722a8e3725 (patch)
tree79af74be763f60e7493913888a88bbf2538719d3 /docs/html/training
parent616908fee48c44a2115d5d63583ccf04e401b3da (diff)
downloadframeworks_base-a15afd2bc4b103146497b521c09c73722a8e3725.zip
frameworks_base-a15afd2bc4b103146497b521c09c73722a8e3725.tar.gz
frameworks_base-a15afd2bc4b103146497b521c09c73722a8e3725.tar.bz2
resolve a few doc issues from external reports
Change-Id: Ic4ca327bf2ac92ed259fbd3c51fe5a4453afb479
Diffstat (limited to 'docs/html/training')
-rw-r--r--docs/html/training/id-auth/authenticate.jd2
-rw-r--r--docs/html/training/implementing-navigation/lateral.jd3
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/html/training/id-auth/authenticate.jd b/docs/html/training/id-auth/authenticate.jd
index c316af7..3084bea 100644
--- a/docs/html/training/id-auth/authenticate.jd
+++ b/docs/html/training/id-auth/authenticate.jd
@@ -114,7 +114,7 @@ am.getAuthToken(
new Handler(new OnError())); // Callback called if an error occurs
</pre>
-<p>In this example, <code>OnTokenAcquired</code> is a class that extends
+<p>In this example, <code>OnTokenAcquired</code> is a class that implements
{@link android.accounts.AccountManagerCallback}. {@link android.accounts.AccountManager} calls
{@link android.accounts.AccountManagerCallback#run run()} on <code>OnTokenAcquired</code> with an
{@link android.accounts.AccountManagerFuture} that contains a {@link android.os.Bundle}. If
diff --git a/docs/html/training/implementing-navigation/lateral.jd b/docs/html/training/implementing-navigation/lateral.jd
index b59bab2..9a31d7a 100644
--- a/docs/html/training/implementing-navigation/lateral.jd
+++ b/docs/html/training/implementing-navigation/lateral.jd
@@ -131,6 +131,9 @@ public class CollectionDemoActivity extends FragmentActivity {
ViewPager mViewPager;
public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_collection_demo);
+
// ViewPager and its adapters use support library
// fragments, so use getSupportFragmentManager.
mDemoCollectionPagerAdapter =