diff options
| author | Elliott Hughes <enh@google.com> | 2014-03-08 01:51:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 01:51:52 +0000 |
| commit | be59a211644d17b00bc24b3359f5ffc8723a4be0 (patch) | |
| tree | 2780a34563e83acfe5c7ddf6e0c100ee1adefc46 /docs/html | |
| parent | 6c18e8adf29f059c5b5d3c73c4aa24cce86251cf (diff) | |
| parent | 29d60b95fa8019c0542f46551057c4d376bb8a7a (diff) | |
| download | frameworks_base-be59a211644d17b00bc24b3359f5ffc8723a4be0.zip frameworks_base-be59a211644d17b00bc24b3359f5ffc8723a4be0.tar.gz frameworks_base-be59a211644d17b00bc24b3359f5ffc8723a4be0.tar.bz2 | |
am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
Miscellaneous small documentation fixes.
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/guide/topics/manifest/activity-element.jd | 2 | ||||
| -rw-r--r-- | docs/html/tools/testing/testing_ui.jd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index bd1edc2..b648d48 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -580,7 +580,7 @@ This attribute was introduced in API Level 3. <a href="#nm"><code>android:name</code></a> attribute. <p>The system reads this attribute to determine which activity should be started when - the use presses the Up button in the action bar. The system can also use this information to + the user presses the Up button in the action bar. The system can also use this information to synthesize a back stack of activities with {@link android.app.TaskStackBuilder}.</p> <p>To support API levels 4 - 16, you can also declare the parent activity with a {@code diff --git a/docs/html/tools/testing/testing_ui.jd b/docs/html/tools/testing/testing_ui.jd index 701415e..4318a21 100644 --- a/docs/html/tools/testing/testing_ui.jd +++ b/docs/html/tools/testing/testing_ui.jd @@ -90,7 +90,7 @@ Functional or black-box UI testing does not require testers to know the internal alt="User interface of uiautomatorviewer tool" height="327px" id="figure1"/> </a> <p class="img-caption"> - <strong>Figure 1.</strong> The {@code uiautomatorviewer} showing the captured interface of a test deviice. + <strong>Figure 1.</strong> The {@code uiautomatorviewer} showing the captured interface of a test device. </p> <p>To analyze the UI components of the application that you want to test:</p> |