diff --git a/docs/html/guide/topics/manifest/intent-filter-element.jd b/docs/html/guide/topics/manifest/intent-filter-element.jd index f90541cafd173..68da981d24997 100644 --- a/docs/html/guide/topics/manifest/intent-filter-element.jd +++ b/docs/html/guide/topics/manifest/intent-filter-element.jd @@ -119,7 +119,11 @@ one activity over others.
The value must be an integer, such as "{@code 100}". Higher numbers have a -higher priority. +higher priority. The default value is 0. +The value must be greater than -1000 and less than 1000.
+ +Also see {@link android.content.IntentFilter#setPriority +setPriority()}.
diff --git a/docs/html/guide/topics/resources/animation-resource.jd b/docs/html/guide/topics/resources/animation-resource.jd index 3af52aae38c63..ef64f07cfb871 100644 --- a/docs/html/guide/topics/resources/animation-resource.jd +++ b/docs/html/guide/topics/resources/animation-resource.jd @@ -217,7 +217,7 @@ group animation elements together inside the<set> element, i
<animator>attributes:
diff --git a/docs/html/training/id-auth/authenticate.jd b/docs/html/training/id-auth/authenticate.jd index c316af79239b6..3084beac35a9c 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 -In this example, OnTokenAcquired is a class that extends
+
In this example, OnTokenAcquired is a class that implements
{@link android.accounts.AccountManagerCallback}. {@link android.accounts.AccountManager} calls
{@link android.accounts.AccountManagerCallback#run run()} on OnTokenAcquired 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 b59bab2c431eb..9a31d7aadd0d5 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 =