Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 679fe25b: am a15afd2b: resolve a few doc issues from external reports

Browse Source 
* commit '679fe25b416f9e558922ea4f1eaa68e0ad0c81f6':
  resolve a few doc issues from external reports
This commit is contained in:
Scott Main
2013-03-12 10:07:36 -07:00
committed by Android Git Automerger
parent e1c2a62a75 679fe25b41
commit 5cb405bcc7
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/html/guide/topics/manifest/intent-filter-element.jd
View File

@@ -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>

2
docs/html/guide/topics/resources/animation-resource.jd
View File

@@ -217,7 +217,7 @@ group animation elements together inside the <code>&lt;set&gt;</code> element, i
</dd>
<dt id="val-animator-element"><code>&lt;animator&gt;</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>

2
docs/html/training/id-auth/authenticate.jd
View File

@@ -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

3
docs/html/training/implementing-navigation/lateral.jd
View File

@@ -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 =