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 | |
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')
23 files changed, 29 insertions, 29 deletions
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd index acb2538..71957be 100644 --- a/docs/html/about/versions/jelly-bean.jd +++ b/docs/html/about/versions/jelly-bean.jd @@ -904,7 +904,7 @@ style="font-weight:500;">App Widgets</span> can resize automatically to fit the <h3>Media codec access</h3> -<p>Android 4.1 provides low-level access to platform hardware and software codecs. Apps can query the system to discover what <strong>low-level media codecs</strong> are available on the device and then and use them in the ways they need. For example, you can now create multiple instances of a media codec, queue input buffers, and receive output buffers in return. In addition, the media codec framework supports protected content. Apps can query for an available codec that is able to play protected content with a DRM solution available on the the device.</p> +<p>Android 4.1 provides low-level access to platform hardware and software codecs. Apps can query the system to discover what <strong>low-level media codecs</strong> are available on the device and then and use them in the ways they need. For example, you can now create multiple instances of a media codec, queue input buffers, and receive output buffers in return. In addition, the media codec framework supports protected content. Apps can query for an available codec that is able to play protected content with a DRM solution available on the device.</p> <h3>USB Audio</h3> diff --git a/docs/html/distribute/googleplay/about/visibility.jd b/docs/html/distribute/googleplay/about/visibility.jd index 4957c0f..18f60e9 100644 --- a/docs/html/distribute/googleplay/about/visibility.jd +++ b/docs/html/distribute/googleplay/about/visibility.jd @@ -39,7 +39,7 @@ style="font-weight:500;">Growth in app consumption</span>: Users download more t </div> <div> -<p>Google Play is also a top destination for visitors from the the web. Anyone +<p>Google Play is also a top destination for visitors from the web. Anyone with a browser can explore everything that Google Play has to offer from its <a href="http://play.google.com/store">web site</a>. Android users can even buy and install the apps they want and Google Play pushes them automatically to their @@ -159,7 +159,7 @@ the editorial team will notice.</p> <h4>Featured and Staff Picks</h4> -<p>Each week the the Google Play editorial staff selects a new set of apps to +<p>Each week the Google Play editorial staff selects a new set of apps to promote in its popular <em>Featured</em> and <em>Staff Picks</em> collections. </p> diff --git a/docs/html/guide/components/fundamentals.jd b/docs/html/guide/components/fundamentals.jd index 2c33a26..ce50022 100644 --- a/docs/html/guide/components/fundamentals.jd +++ b/docs/html/guide/components/fundamentals.jd @@ -345,7 +345,7 @@ receivers can be either declared in the manifest or created dynamically in code {@link android.content.BroadcastReceiver} objects) and registered with the system by calling {@link android.content.Context#registerReceiver registerReceiver()}.</p> -<p>For more about how to structure the manifest file for your application, see the <a +<p>For more about how to structure the manifest file for your application, see <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a> documentation. </p> diff --git a/docs/html/guide/components/tasks-and-back-stack.jd b/docs/html/guide/components/tasks-and-back-stack.jd index ecaba8d..a21bf34 100644 --- a/docs/html/guide/components/tasks-and-back-stack.jd +++ b/docs/html/guide/components/tasks-and-back-stack.jd @@ -231,7 +231,7 @@ activities except for the root activity when the user leaves the task.</p> <activity>}</a> manifest element and with flags in the intent that you pass to {@link android.app.Activity#startActivity startActivity()}.</p> -<p>In this regard, the the principal <a +<p>In this regard, the principal <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>}</a> attributes you can use are:</p> @@ -319,7 +319,7 @@ each instance can belong to different tasks, and one task can have multiple inst routes the intent to that instance through a call to its {@link android.app.Activity#onNewIntent onNewIntent()} method, rather than creating a new instance of the activity. The activity can be instantiated multiple times, each instance can -belong to different tasks, and one task can have multiple instances (but only if the the +belong to different tasks, and one task can have multiple instances (but only if the activity at the top of the back stack is <em>not</em> an existing instance of the activity). <p>For example, suppose a task's back stack consists of root activity A with activities B, C, and D on top (the stack is A-B-C-D; D is on top). An intent arrives for an activity of type D. diff --git a/docs/html/guide/topics/admin/device-admin.jd b/docs/html/guide/topics/admin/device-admin.jd index 4a325db..f917576 100644 --- a/docs/html/guide/topics/admin/device-admin.jd +++ b/docs/html/guide/topics/admin/device-admin.jd @@ -339,7 +339,7 @@ a label.</li> </code> is a permission that a {@link android.app.admin.DeviceAdminReceiver} subclass must have, to ensure that only the system can interact with the receiver (no application can be granted this permission). This prevents other applications from abusing your device admin app.</li> -<li><code>android.app.action.DEVICE_ADMIN_ENABLED</code> is the the primary +<li><code>android.app.action.DEVICE_ADMIN_ENABLED</code> is the primary action that a {@link android.app.admin.DeviceAdminReceiver} subclass must handle to be allowed to manage a device. This is set to the receiver when the user enables the device admin app. Your code typically handles this in diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd index 6e6fa28..93d6c6f 100644 --- a/docs/html/guide/topics/appwidgets/index.jd +++ b/docs/html/guide/topics/appwidgets/index.jd @@ -1119,7 +1119,7 @@ initialize an array of <code>WidgetItem</code> objects. When your app widget is active, the system accesses these objects using their index position in the array and the text they contain is displayed </p> -<p>Here is an excerpt from the the <a +<p>Here is an excerpt from the <a href="{@docRoot}resources/samples/StackWidget/index.html">StackView Widget</a> sample's {@link android.widget.RemoteViewsService.RemoteViewsFactory diff --git a/docs/html/guide/topics/connectivity/wifip2p.jd b/docs/html/guide/topics/connectivity/wifip2p.jd index bbf30fd..efb3ac7 100644 --- a/docs/html/guide/topics/connectivity/wifip2p.jd +++ b/docs/html/guide/topics/connectivity/wifip2p.jd @@ -433,7 +433,7 @@ if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) { <p>The {@link android.net.wifi.p2p.WifiP2pManager#requestPeers requestPeers()} method is also asynchronous and can notify your activity when a list of peers is available with {@link - android.net.wifi.p2p.WifiP2pManager.PeerListListener#onPeersAvailable onPeersAvailable()}, which is defined in the + android.net.wifi.p2p.WifiP2pManager.PeerListListener#onPeersAvailable onPeersAvailable()}, which is defined in the {@link android.net.wifi.p2p.WifiP2pManager.PeerListListener} interface. The {@link android.net.wifi.p2p.WifiP2pManager.PeerListListener#onPeersAvailable onPeersAvailable()} method provides you with an {@link android.net.wifi.p2p.WifiP2pDeviceList}, which you can iterate diff --git a/docs/html/guide/topics/graphics/opengl.jd b/docs/html/guide/topics/graphics/opengl.jd index 6114a4a..5630e63 100644 --- a/docs/html/guide/topics/graphics/opengl.jd +++ b/docs/html/guide/topics/graphics/opengl.jd @@ -444,7 +444,7 @@ investigate other texture compression formats available on your target devices.< <p>Beyond the ETC1 format, Android devices have varied support for texture compression based on their GPU chipsets and OpenGL implementations. You should investigate texture compression support on -the the devices you are are targeting to determine what compression types your application should +the devices you are are targeting to determine what compression types your application should support. In order to determine what texture formats are supported on a given device, you must <a href="#gl-extension-query">query the device</a> and review the <em>OpenGL extension names</em>, which identify what texture compression formats (and other OpenGL features) are supported by the diff --git a/docs/html/guide/topics/manifest/activity-alias-element.jd b/docs/html/guide/topics/manifest/activity-alias-element.jd index ba2c154..d3df08b 100644 --- a/docs/html/guide/topics/manifest/activity-alias-element.jd +++ b/docs/html/guide/topics/manifest/activity-alias-element.jd @@ -89,7 +89,7 @@ See the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&l <dt><a name="label"></a>{@code android:label}</dt> <dd>A user-readable label for the alias when presented to users through the alias. -See the the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> element's +See the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> element's <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#label">label</a></code> attribute for more information. </p></dd> @@ -132,4 +132,4 @@ the alias in the manifest. <dt>see also:</dt> <dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code></dd> -</dl>
\ No newline at end of file +</dl> diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index 2aedaec..c9f505f 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -217,7 +217,7 @@ separated by '{@code |}' — for example, "{@code locale|navigation|orientat </tr><tr> <td>"{@code uiMode}"</td> <td>The user interface mode has changed — this can be caused when the user places the -device into a desk/car dock or when the the night mode changes. See {@link +device into a desk/car dock or when the night mode changes. See {@link android.app.UiModeManager}. <em>Added in API level 8</em>.</td> </tr><tr> diff --git a/docs/html/guide/topics/providers/calendar-provider.jd b/docs/html/guide/topics/providers/calendar-provider.jd index 5adc68c..3cd4511 100644 --- a/docs/html/guide/topics/providers/calendar-provider.jd +++ b/docs/html/guide/topics/providers/calendar-provider.jd @@ -816,7 +816,7 @@ zone. <tr> <td>{@link android.provider.CalendarContract.Instances#END_MINUTE}</td> - <td>The end minute of the instance measured from midnight in the the + <td>The end minute of the instance measured from midnight in the Calendar's time zone.</td> </tr> diff --git a/docs/html/guide/topics/resources/animation-resource.jd b/docs/html/guide/topics/resources/animation-resource.jd index ef64f07..e5cac88 100644 --- a/docs/html/guide/topics/resources/animation-resource.jd +++ b/docs/html/guide/topics/resources/animation-resource.jd @@ -593,7 +593,7 @@ attribute, the value of which is a reference to an interpolator resource.</p> <p>All interpolators available in Android are subclasses of the {@link android.view.animation.Interpolator} class. For each interpolator class, Android includes a public resource you can reference in order to apply the interpolator to an animation -using the the {@code android:interpolator} attribute. +using the {@code android:interpolator} attribute. The following table specifies the resource to use for each interpolator:</p> <table> diff --git a/docs/html/guide/topics/ui/drag-drop.jd b/docs/html/guide/topics/ui/drag-drop.jd index cacdf5c..884a1b2 100644 --- a/docs/html/guide/topics/ui/drag-drop.jd +++ b/docs/html/guide/topics/ui/drag-drop.jd @@ -750,7 +750,7 @@ imageView.setOnLongClickListener(new View.OnLongClickListener() { A{@link android.view.DragEvent#ACTION_DRAG_EXITED} event, it receives a new {@link android.view.DragEvent#ACTION_DRAG_LOCATION} event every time the touch point moves. The {@link android.view.DragEvent#getX()} and {@link android.view.DragEvent#getY()} methods - return the the X and Y coordinates of the touch point. + return the X and Y coordinates of the touch point. </li> <li> {@link android.view.DragEvent#ACTION_DRAG_EXITED}: This event is sent to a listener that @@ -995,4 +995,4 @@ protected class myDragEventListener implements View.OnDragEventListener { }; }; }; -</pre>
\ No newline at end of file +</pre> diff --git a/docs/html/guide/topics/ui/menus.jd b/docs/html/guide/topics/ui/menus.jd index 01d373e..dfcea52 100644 --- a/docs/html/guide/topics/ui/menus.jd +++ b/docs/html/guide/topics/ui/menus.jd @@ -834,7 +834,7 @@ android.view.Menu#setGroupCheckable(int,boolean,boolean) setGroupCheckable()}</l </ul> <p>You can create a group by nesting {@code <item>} elements inside a {@code <group>} -element in your menu resource or by specifying a group ID with the the {@link +element in your menu resource or by specifying a group ID with the {@link android.view.Menu#add(int,int,int,int) add()} method.</p> <p>Here's an example menu resource that includes a group:</p> 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/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/training/accessibility/service.jd b/docs/html/training/accessibility/service.jd index 373ddbb..953c558 100644 --- a/docs/html/training/accessibility/service.jd +++ b/docs/html/training/accessibility/service.jd @@ -204,7 +204,7 @@ public void onAccessibilityEvent(AccessibilityEvent event) { <p>This step is optional, but highly useful. One of the new features in Android 4.0 (API Level 14) is the ability for an {@link android.accessibilityservice.AccessibilityService} to query the view -hierarchy, collecting information about the the UI component that generated an event, and +hierarchy, collecting information about the UI component that generated an event, and its parent and children. In order to do this, make sure that you set the following line in your XML configuration:</p> <pre> diff --git a/docs/html/training/basics/network-ops/managing.jd b/docs/html/training/basics/network-ops/managing.jd index 0f3d495..990b8cb 100644 --- a/docs/html/training/basics/network-ops/managing.jd +++ b/docs/html/training/basics/network-ops/managing.jd @@ -269,7 +269,7 @@ returns to the main activity:</p> // When the user changes the preferences selection, // onSharedPreferenceChanged() restarts the main activity as a new - // task. Sets the the refreshDisplay flag to "true" to indicate that + // task. Sets the refreshDisplay flag to "true" to indicate that // the main activity should update its display. // The main activity queries the PreferenceManager to get the latest settings. diff --git a/docs/html/training/gestures/scroll.jd b/docs/html/training/gestures/scroll.jd index bd1537a..3e3aa14 100644 --- a/docs/html/training/gestures/scroll.jd +++ b/docs/html/training/gestures/scroll.jd @@ -56,7 +56,7 @@ scrolling animation in response to a touch event. They are similar, but {@link android.widget.OverScroller} includes methods for indicating to users that they've reached the content edges after a pan or fling gesture. The {@code InteractiveChart} sample -uses the the {@link android.widget.EdgeEffect} class +uses the {@link android.widget.EdgeEffect} class (actually the {@link android.support.v4.widget.EdgeEffectCompat} class) to display a "glow" effect when users reach the content edges.</p> diff --git a/docs/html/training/in-app-billing/list-iab-products.jd b/docs/html/training/in-app-billing/list-iab-products.jd index 36ff34a..c423fc1 100644 --- a/docs/html/training/in-app-billing/list-iab-products.jd +++ b/docs/html/training/in-app-billing/list-iab-products.jd @@ -54,7 +54,7 @@ next.link=purchase-iab-products.html <li>The {@code List} argument consists of one or more product IDs (also called SKUs) for the products that you want to query.</li> <li>Finally, the {@code QueryInventoryFinishedListener} argument specifies a listener is notified when the query operation has completed and handles the query response.</li> </ul> -If you use the the convenience classes provided in the sample, the classes will handle background thread management for In-app Billing requests, so you can safely make queries from the main thread of your application. +If you use the convenience classes provided in the sample, the classes will handle background thread management for In-app Billing requests, so you can safely make queries from the main thread of your application. </p> <p>The following code shows how you can retrieve the details for two products with IDs {@code SKU_APPLE} and {@code SKU_BANANA} that you previously defined in the Developer Console.</p> diff --git a/docs/html/training/monitoring-device-state/docking-monitoring.jd b/docs/html/training/monitoring-device-state/docking-monitoring.jd index 3787a55..5c8bfd6 100644 --- a/docs/html/training/monitoring-device-state/docking-monitoring.jd +++ b/docs/html/training/monitoring-device-state/docking-monitoring.jd @@ -79,7 +79,7 @@ boolean isDesk = dockState == EXTRA_DOCK_STATE_DESK || <h2 id="MonitorDockState">Monitor for Changes in the Dock State or Type</h2> -<p>Whenever the the device is docked or undocked, the {@link +<p>Whenever the device is docked or undocked, the {@link android.content.Intent#ACTION_DOCK_EVENT} action is broadcast. To monitor changes in the device's dock-state, simply register a broadcast receiver in your application manifest as shown in the snippet below:</p> diff --git a/docs/html/training/multiple-threads/define-runnable.jd b/docs/html/training/multiple-threads/define-runnable.jd index 17640a9..40853d3 100644 --- a/docs/html/training/multiple-threads/define-runnable.jd +++ b/docs/html/training/multiple-threads/define-runnable.jd @@ -98,7 +98,7 @@ class PhotoDecodeRunnable implements Runnable { android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND); ... /* - * Stores the current Thread in the the PhotoTask instance, + * Stores the current Thread in the PhotoTask instance, * so that the instance * can interrupt the Thread. */ |