diff options
| author | kmccormick <kmccormick@google.com> | 2013-04-03 20:07:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-03 20:07:53 +0000 |
| commit | 8b5e342b0e24b9bb546456209d9d27480fa233e8 (patch) | |
| tree | e8871a28a02cd2b004dde7b7f9a5e592a3c6d22b /docs/html/tools/testing | |
| parent | 555c82cd43ef8d11bcf54f023864619869c06411 (diff) | |
| parent | 76dfc02135abae5337b48fe99a1b8c0a7d95e33a (diff) | |
| download | frameworks_base-8b5e342b0e24b9bb546456209d9d27480fa233e8.zip frameworks_base-8b5e342b0e24b9bb546456209d9d27480fa233e8.tar.gz frameworks_base-8b5e342b0e24b9bb546456209d9d27480fa233e8.tar.bz2 | |
Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
Diffstat (limited to 'docs/html/tools/testing')
| -rw-r--r-- | docs/html/tools/testing/activity_test.jd | 4 | ||||
| -rw-r--r-- | docs/html/tools/testing/activity_testing.jd | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/html/tools/testing/activity_test.jd b/docs/html/tools/testing/activity_test.jd index 8288249..096aea5 100644 --- a/docs/html/tools/testing/activity_test.jd +++ b/docs/html/tools/testing/activity_test.jd @@ -537,7 +537,7 @@ import android.widget.Spinner; import android.widget.SpinnerAdapter; </pre> <p> - You now have the the complete <code>setUp()</code> method. + You now have the complete <code>setUp()</code> method. </p> <h3 id="AddPreConditionsTest">Adding an initial conditions test</h3> <p> @@ -1266,7 +1266,7 @@ $ adb install Spinner/bin/SpinnerActivity-debug.apk </li> <li> Follow the tutorial, starting with the section <a href="#CreateTestCaseClass">Creating the Test Case Class</a>. When you are prompted to - run the sample application, go the the Launcher screen in your device or emulator and select SpinnerActivity. + run the sample application, go to the Launcher screen in your device or emulator and select SpinnerActivity. When you are prompted to run the test application, return here to continue with the following instructions. </li> <li> diff --git a/docs/html/tools/testing/activity_testing.jd b/docs/html/tools/testing/activity_testing.jd index 7190b98..88ac9b2 100644 --- a/docs/html/tools/testing/activity_testing.jd +++ b/docs/html/tools/testing/activity_testing.jd @@ -77,7 +77,7 @@ parent.link=index.html </div> </div> <p> - Activity testing is particularly dependent on the the Android instrumentation framework. + Activity testing is particularly dependent on the Android instrumentation framework. Unlike other components, activities have a complex lifecycle based on callback methods; these can't be invoked directly except by instrumentation. Also, the only way to send events to the user interface from a program is through instrumentation. @@ -322,7 +322,7 @@ parent.link=index.html the published application. </p> <p> - To add the the permission, add the element + To add the permission, add the element <code><uses-permission android:name="android.permission.DISABLE_KEYGUARD"/></code> as a child of the <code><manifest></code> element. To disable the KeyGuard, add the following code to the <code>onCreate()</code> method of activities you intend to test: |