diff options
Diffstat (limited to 'docs/html/tools')
| -rw-r--r-- | docs/html/tools/debugging/ddms.jd | 2 | ||||
| -rw-r--r-- | docs/html/tools/device.jd | 2 | ||||
| -rw-r--r-- | docs/html/tools/devices/emulator.jd | 4 | ||||
| -rw-r--r-- | docs/html/tools/projects/index.jd | 10 | ||||
| -rw-r--r-- | docs/html/tools/testing/activity_test.jd | 4 | ||||
| -rw-r--r-- | docs/html/tools/testing/activity_testing.jd | 4 | ||||
| -rw-r--r-- | docs/html/tools/testing/testing_android.jd | 4 | ||||
| -rw-r--r-- | docs/html/tools/testing/testing_otheride.jd | 6 | ||||
| -rw-r--r-- | docs/html/tools/workflow/index.jd | 2 |
9 files changed, 19 insertions, 19 deletions
diff --git a/docs/html/tools/debugging/ddms.jd b/docs/html/tools/debugging/ddms.jd index 3d6324b..f641aad 100644 --- a/docs/html/tools/debugging/ddms.jd +++ b/docs/html/tools/debugging/ddms.jd @@ -54,7 +54,7 @@ parent.link=index.html <p>When DDMS starts, it connects to <a href="{@docRoot}tools/help/adb.html">adb</a>. When a device is connected, a VM monitoring service is created between <code>adb</code> and DDMS, which notifies DDMS when a VM on the device is started or terminated. Once a VM - is running, DDMS retrieves the the VM's process ID (pid), via <code>adb</code>, and opens a connection to the + is running, DDMS retrieves the VM's process ID (pid), via <code>adb</code>, and opens a connection to the VM's debugger, through the adb daemon (adbd) on the device. DDMS can now talk to the VM using a custom wire protocol.</p> diff --git a/docs/html/tools/device.jd b/docs/html/tools/device.jd index 9bdaf47..c7827b2 100644 --- a/docs/html/tools/device.jd +++ b/docs/html/tools/device.jd @@ -30,7 +30,7 @@ device directly from Eclipse or from the command line with ADB. If you don't yet have a device, check with the service providers in your area to determine which Android-powered devices are available.</p> -<p>If you want a SIM-unlocked phone, then you might consider the Google Nexus S. To find a place +<p>If you want a SIM-unlocked phone, then you might consider a Nexus phone. To find a place to purchase the Nexus S and other Android-powered devices, visit <a href="http://www.google.com/phone/detail/nexus-s">google.com/phone</a>.</p> diff --git a/docs/html/tools/devices/emulator.jd b/docs/html/tools/devices/emulator.jd index cee6473..fda233d 100644 --- a/docs/html/tools/devices/emulator.jd +++ b/docs/html/tools/devices/emulator.jd @@ -898,7 +898,7 @@ to a specified guest port on the router, while the router directs traffic to/from that port to the emulated device's host port. </p> <p>To set up the network redirection, you create a mapping of host and guest -ports/addresses on the the emulator instance. There are two ways to set up +ports/addresses on the emulator instance. There are two ways to set up network redirection: using emulator console commands and using the ADB tool, as described below. </p> @@ -1254,7 +1254,7 @@ syntax for this command is as follows: </p> <td> </td> </tr> <tr> - <td><code>power health <percent></code></td> + <td><code>capacity <percent></code></td> <td>Set remaining battery capacity state (0-100).</td> <td> </td> </tr> diff --git a/docs/html/tools/projects/index.jd b/docs/html/tools/projects/index.jd index 6a49ac9..439d3be 100644 --- a/docs/html/tools/projects/index.jd +++ b/docs/html/tools/projects/index.jd @@ -68,12 +68,12 @@ page.title=Managing Projects <code>src<em>/your/package/namespace/ActivityName</em>.java</code>. All other source code files (such as <code>.java</code> or <code>.aidl</code> files) go here as well.</dd> - <dt><code>bin</code></dt> + <dt><code>bin/</code></dt> <dd>Output directory of the build. This is where you can find the final <code>.apk</code> file and other compiled resources.</dd> - <dt><code>jni</code></dt> + <dt><code>jni/</code></dt> <dd>Contains native code sources developed using the Android NDK. For more information, see the <a href="{@docRoot}tools/sdk/ndk/index.html">Android NDK documentation</a>.</dd> @@ -88,7 +88,7 @@ page.title=Managing Projects <dd>This is empty. You can use it to store raw asset files. Files that you save here are compiled into an <code>.apk</code> file as-is, and the original filename is preserved. You can navigate this directory in the same way as a typical file system using URIs and read files as a stream of - bytes using the the {@link android.content.res.AssetManager}. For example, this is a good + bytes using the {@link android.content.res.AssetManager}. For example, this is a good location for textures and game data.</dd> <dt><code>res/</code></dt> @@ -114,7 +114,7 @@ page.title=Managing Projects <dt><code>drawable/</code></dt> <dd>For bitmap files (PNG, JPEG, or GIF), 9-Patch image files, and XML files that describe - Drawable shapes or a Drawable objects that contain multiple states (normal, pressed, or + Drawable shapes or Drawable objects that contain multiple states (normal, pressed, or focused). See the <a href= "{@docRoot}guide/topics/resources/drawable-resource.html">Drawable</a> resource type.</dd> @@ -251,7 +251,7 @@ used.</dd> code and resources as a standard Android project, stored in the same way. For example, source code in the library project can access its own resources through its <code>R</code> class.</p> - <p>However, a library project differs from an standard Android application project in that you + <p>However, a library project differs from a standard Android application project in that you cannot compile it directly to its own <code>.apk</code> and run it on an Android device. Similarly, you cannot export the library project to a self-contained JAR file, as you would do for a true library. Instead, you must compile the library indirectly, by referencing the 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: diff --git a/docs/html/tools/testing/testing_android.jd b/docs/html/tools/testing/testing_android.jd index acf5ec2..10843e8 100644 --- a/docs/html/tools/testing/testing_android.jd +++ b/docs/html/tools/testing/testing_android.jd @@ -111,14 +111,14 @@ parent.link=index.html </li> <li> The SDK tools for building and tests are available in Eclipse with ADT, and also in - command-line form for use with other IDES. These tools get information from the project of + command-line form for use with other IDEs. These tools get information from the project of the application under test and use this information to automatically create the build files, manifest file, and directory structure for the test package. </li> <li> The SDK also provides <a href="{@docRoot}tools/help/monkeyrunner_concepts.html">monkeyrunner</a>, an API - testing devices with Python programs, and <a + for testing devices with Python programs, and <a href="{@docRoot}tools/help/monkey.html">UI/Application Exerciser Monkey</a>, a command-line tool for stress-testing UIs by sending pseudo-random events to a device. </li> diff --git a/docs/html/tools/testing/testing_otheride.jd b/docs/html/tools/testing/testing_otheride.jd index 0678f52..9484158 100644 --- a/docs/html/tools/testing/testing_otheride.jd +++ b/docs/html/tools/testing/testing_otheride.jd @@ -75,9 +75,9 @@ parent.link=index.html <p> You use the <code>android</code> tool to create test projects. You also use <code>android</code> to convert existing test code into an Android test project, - or to add the <code>run-tests</code> Ant target to an existing Android test project. + or to add the <code>test</code> Ant target to an existing Android test project. These operations are described in more detail in the section <a href="#UpdateTestProject"> - Updating a test project</a>. The <code>run-tests</code> target is described in + Updating a test project</a>. The <code>test</code> target is described in <a href="#RunTestsAnt">Quick build and run with Ant</a>. </p> <h3 id="CreateTestProject">Creating a test project</h3> @@ -300,7 +300,7 @@ $ android create test-project -m ../HelloAndroid -n HelloAndroidTest -p HelloAnd <h3 id="RunTestsAnt">Quick build and run with Ant</h3> <p> You can use Ant to run all the tests in your test project, using the target - <code>run-tests</code>, which is created automatically when you create a test project with + <code>test</code>, which is created automatically when you create a test project with the <code>android</code> tool. </p> <p> diff --git a/docs/html/tools/workflow/index.jd b/docs/html/tools/workflow/index.jd index 5ae06e6..784b212 100644 --- a/docs/html/tools/workflow/index.jd +++ b/docs/html/tools/workflow/index.jd @@ -34,7 +34,7 @@ development steps encompass four development phases, which include:</p> </li> <li><strong>Development</strong> <p>During this phase you set up and develop your Android project, which contains all of the - source code and resource files for your application. For more informations, see + source code and resource files for your application. For more information, see <a href="{@docRoot}tools/projects/index.html">Create an Android project</a>.</p> </li> <li><strong>Debugging and Testing</strong> |