diff options
| author | Scott Main <smain@google.com> | 2013-03-12 10:15:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-12 10:15:40 -0700 |
| commit | 9725d80adc7426ea20f3a193fc81dc1e8b8c4b31 (patch) | |
| tree | f2ec34ae0973992c2f7893ab0f35e318f76fbbff /docs | |
| parent | 998b692d888765d10827264c953b227439fbf365 (diff) | |
| parent | 22bcc39be8e7f7ef2b6b40714ae956fbaa5ff5b0 (diff) | |
| download | frameworks_base-9725d80adc7426ea20f3a193fc81dc1e8b8c4b31.zip frameworks_base-9725d80adc7426ea20f3a193fc81dc1e8b8c4b31.tar.gz frameworks_base-9725d80adc7426ea20f3a193fc81dc1e8b8c4b31.tar.bz2 | |
am 22bcc39b: am 5c748fa5: am 5cb405bc: am 679fe25b: am a15afd2b: resolve a few doc issues from external reports
* commit '22bcc39be8e7f7ef2b6b40714ae956fbaa5ff5b0':
resolve a few doc issues from external reports
Diffstat (limited to 'docs')
4 files changed, 10 insertions, 3 deletions
diff --git a/docs/html/guide/topics/manifest/intent-filter-element.jd b/docs/html/guide/topics/manifest/intent-filter-element.jd index f90541c..68da981 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. <p> 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.</p> + +<p>Also see {@link android.content.IntentFilter#setPriority +setPriority()}. </p></dd> </dl></dd> diff --git a/docs/html/guide/topics/resources/animation-resource.jd b/docs/html/guide/topics/resources/animation-resource.jd index 3af52aa..ef64f07 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 <code><set></code> element, i </dd> <dt id="val-animator-element"><code><animator></code></dt> - <dd>Animates a over a specified amount of time. + <dd>Performs an animation over a specified amount of time. Represents a {@link android.animation.ValueAnimator}. <p class="caps">attributes:</p> 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 = |