summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-04-03 12:41:12 -0700
committerkmccormick <kmccormick@google.com>2013-04-03 13:04:06 -0700
commit76dfc02135abae5337b48fe99a1b8c0a7d95e33a (patch)
treee44e200019cd380ca9fc256099c4e0d3dbc7bea1 /docs/html/tools
parent2ab257231fe774748298ab92f78564a5e19f23f0 (diff)
downloadframeworks_base-76dfc02135abae5337b48fe99a1b8c0a7d95e33a.zip
frameworks_base-76dfc02135abae5337b48fe99a1b8c0a7d95e33a.tar.gz
frameworks_base-76dfc02135abae5337b48fe99a1b8c0a7d95e33a.tar.bz2
Doc update: clean up ubiquitous typo "the the"
"Bug: 8531405" Change-Id: Ib2b96dd2c1ab0f4d8abe5a8052bf2ef33f03b8be
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/devices/emulator.jd2
-rw-r--r--docs/html/tools/projects/index.jd2
-rw-r--r--docs/html/tools/testing/activity_test.jd4
-rw-r--r--docs/html/tools/testing/activity_testing.jd4
4 files changed, 6 insertions, 6 deletions
diff --git a/docs/html/tools/devices/emulator.jd b/docs/html/tools/devices/emulator.jd
index bae3985..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>
diff --git a/docs/html/tools/projects/index.jd b/docs/html/tools/projects/index.jd
index 6a49ac9..6931cc7 100644
--- a/docs/html/tools/projects/index.jd
+++ b/docs/html/tools/projects/index.jd
@@ -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>
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>&lt;uses-permission android:name="android.permission.DISABLE_KEYGUARD"/&gt;</code>
as a child of the <code>&lt;manifest&gt;</code> element. To disable the KeyGuard, add the
following code to the <code>onCreate()</code> method of activities you intend to test: