diff options
18 files changed, 29 insertions, 22 deletions
diff --git a/docs/html/guide/developing/testing/testing_otheride.jd b/docs/html/guide/developing/testing/testing_otheride.jd index 523a8e57f36e..adb0efac8a37 100644 --- a/docs/html/guide/developing/testing/testing_otheride.jd +++ b/docs/html/guide/developing/testing/testing_otheride.jd @@ -296,7 +296,7 @@ $ android create test-project -m ../HelloAndroid -n HelloAndroidTest -p HelloAnd <h2 id="RunTestsCommand">Running Tests</h2> <p> You run tests from the command line, either with Ant or with an - <a href="{@docRoot}http://developer.android.com/guide/developing/tools/adb.html"> + <a href="{@docRoot}guide/developing/tools/adb.html"> Android Debug Bridge (adb)</a> shell. </p> <h3 id="RunTestsAnt">Quick build and run with Ant</h3> @@ -318,7 +318,7 @@ $ android create test-project -m ../HelloAndroid -n HelloAndroidTest -p HelloAnd <h3 id="RunTestsDevice">Running tests on a device or emulator</h3> <p> When you run tests from the command line with - <a href="{@docRoot}http://developer.android.com/guide/developing/tools/adb.html"> + <a href="{@docRoot}guide/developing/tools/adb.html"> Android Debug Bridge (adb)</a>, you get more options for choosing the tests to run than with any other method. You can select individual test methods, filter tests according to their annotation, or specify testing options. Since the test run is controlled diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd index f07cdd58d541..2250979090bd 100644 --- a/docs/html/guide/developing/tools/emulator.jd +++ b/docs/html/guide/developing/tools/emulator.jd @@ -496,8 +496,8 @@ on disk images, use <code>-help-disk-images</code>.</p> <td>Enable the root shell (as in <code>-shell</code> and specify the QEMU character device to use for communication with the shell.</td> <td><device> must be a QEMU device type. See the documentation for '-serial <em>dev</em>' at - <a href="http://www.nongnu.org/qemu/qemu-doc.html#SEC10">http://www.bellard.org/qemu/qemu-doc.html#SEC10</a> - for a list of device types.</p> + <a href="http://wiki.qemu.org/download/qemu-doc.html">wiki.qemu.org</a> + for more information.</p> <p>Here are some examples: </p> <ul> diff --git a/docs/html/guide/topics/admin/device-admin.jd b/docs/html/guide/topics/admin/device-admin.jd index fda716a45b38..b86a5f0836ab 100644 --- a/docs/html/guide/topics/admin/device-admin.jd +++ b/docs/html/guide/topics/admin/device-admin.jd @@ -156,14 +156,14 @@ Administration API lets you do the following:</p> <ul> <h2 id="sample">Sample Application</h2> <p>The examples used in this document are based on the <a -href="{@docRoot}resources/samples/ApiDemos/src/com/example/ -android/apis/app/DeviceAdminSample.html">Device Administration API +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.html"> +Device Administration API sample</a>, which is included in the SDK samples. For information on downloading and installing the SDK samples, see <a href="{@docRoot}resources/samples/get.html"> Getting the Samples</a>. Here is the <a -href="{@docRoot}resources/samples/ApiDemos/src/com/example/ -android/apis/app/DeviceAdminSample.html">complete code</a> for +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.html"> +complete code</a> for the sample. </p> <p>The sample application offers a demo of device admin features. It presents users diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index 2e43c3069f99..a2a4001cc4be 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -339,7 +339,7 @@ the feature as shown below.</p> <p class="caution">It's important to understand that the permissions that you request in <code><uses-permission></code> elements can directly affect how Android Market filters your application. The reference section <a -href="permissions-features">Permissions that Imply Feature Requirements</a>, +href="#permissions-features">Permissions that Imply Feature Requirements</a>, below, lists the full set of permissions that imply feature requirements and therefore trigger filtering.</p> diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd index 36369d35f198..b0695210b0e0 100644 --- a/docs/html/guide/topics/resources/layout-resource.jd +++ b/docs/html/guide/topics/resources/layout-resource.jd @@ -181,7 +181,7 @@ that already contains the appropriate parent View to contain the children of the in another layout file using <a href="#include-element"><code><include></code></a> and this layout doesn't require a different {@link android.view.ViewGroup} container. For more information about merging layouts, read <a -href="{@docRoot}resources/articles/layout-tricks-merging.html">Layout +href="{@docRoot}resources/articles/layout-tricks-merge.html">Layout Tricks: Merging</a>.</dd> </dl> diff --git a/docs/html/guide/topics/testing/contentprovider_testing.jd b/docs/html/guide/topics/testing/contentprovider_testing.jd index 279e34715aa4..e42e63148478 100644 --- a/docs/html/guide/topics/testing/contentprovider_testing.jd +++ b/docs/html/guide/topics/testing/contentprovider_testing.jd @@ -37,7 +37,7 @@ page.title=Content Provider Testing <ol> <li> <a - href="{@docRoot}guide/topics/testing/topics/testing_android.html"> + href="{@docRoot}guide/topics/testing/testing_android.html"> Testing Fundamentals</a> </li> <li> @@ -123,7 +123,8 @@ page.title=Content Provider Testing The constructor then creates a {@link android.test.mock.MockContentResolver} to use as the resolver for the test. The {@link android.test.mock.MockContentResolver} class is described in detail in the section - <a href="{@docRoot}guide/topics/testing/test_android#MockObjectClasses">Mock object classes</a>. + <a href="{@docRoot}guide/topics/testing/testing_android.html#MockObjectClasses">Mock object +classes</a>. </p> <p> Lastly, the constructor creates an instance of the provider under test. This is a normal @@ -137,7 +138,7 @@ page.title=Content Provider Testing {@link android.test.ProviderTestCase2} uses {@link android.test.IsolatedContext} and {@link android.test.mock.MockContentResolver}, which are standard mock object classes. To learn more about them, please read - <a href="{@docRoot}guide/topics/testing/test_android#MockObjectClasses"> + <a href="{@docRoot}guide/topics/testing/testing_android.html#MockObjectClasses"> Testing Fundamentals</a>. </p> <h2 id="WhatToTest">What To Test</h2> diff --git a/docs/html/guide/topics/testing/index.jd b/docs/html/guide/topics/testing/index.jd index 762a8975d970..cf87187aa012 100644 --- a/docs/html/guide/topics/testing/index.jd +++ b/docs/html/guide/topics/testing/index.jd @@ -73,6 +73,7 @@ page.title=Testing to test applications and devices. </li> </ul> +<!-- <h4>Samples</h4> <ul> <li> @@ -82,3 +83,4 @@ page.title=Testing testing a {@link android.app.Service}. </li> </ul> +--> diff --git a/docs/html/guide/topics/testing/what_to_test.jd b/docs/html/guide/topics/testing/what_to_test.jd index e13538ad139d..e8a27da8ce0a 100644 --- a/docs/html/guide/topics/testing/what_to_test.jd +++ b/docs/html/guide/topics/testing/what_to_test.jd @@ -79,6 +79,6 @@ page.title=What To Test <a href="{@docRoot}guide/developing/tools/emulator.html#netspeed">Network Speed Emulation</a>. To test GPS, you can use the emulator console and {@link android.location.LocationManager}. To learn more about the emulator console, please see - <a href="{@docRoot}/guide/developing/tools/emulator.html#console"> + <a href="{@docRoot}guide/developing/tools/emulator.html#console"> Using the Emulator Console</a>. </p> diff --git a/docs/html/images/developing/avd-dialog.png b/docs/html/images/developing/avd-dialog.png Binary files differindex 693aa421855d..d0e2eec3f724 100755..100644 --- a/docs/html/images/developing/avd-dialog.png +++ b/docs/html/images/developing/avd-dialog.png diff --git a/docs/html/images/sdk_manager_packages.png b/docs/html/images/sdk_manager_packages.png Binary files differindex 027cce76c6fe..fd59ac6bc975 100755..100644 --- a/docs/html/images/sdk_manager_packages.png +++ b/docs/html/images/sdk_manager_packages.png diff --git a/docs/html/resources/articles/layout-tricks-merge.jd b/docs/html/resources/articles/layout-tricks-merge.jd index 3e165d29564e..00e047985572 100644 --- a/docs/html/resources/articles/layout-tricks-merge.jd +++ b/docs/html/resources/articles/layout-tricks-merge.jd @@ -1,7 +1,9 @@ page.title=Layout Tricks: Merging Layouts @jd:body -<p>The <a href=""></a> articles showed you how to use the <code><include /></code> tag in XML layouts, to reuse and share your layout code. This article explains the <code><merge /></code> tag and how it complements the <code><include /></code> tag.</p> +<p>The articles showed you how to use the <code><include /></code> tag in XML layouts, to +reuse and share your layout code. This article explains the <code><merge /></code> tag and how +it complements the <code><include /></code> tag.</p> <p>The <code><merge /></code> tag was created for the purpose of optimizing Android layouts by reducing the number of levels in view trees. It's diff --git a/docs/html/resources/articles/layout-tricks-stubs.jd b/docs/html/resources/articles/layout-tricks-stubs.jd index 88e4b25d22b9..88bcb78a91db 100644 --- a/docs/html/resources/articles/layout-tricks-stubs.jd +++ b/docs/html/resources/articles/layout-tricks-stubs.jd @@ -17,7 +17,7 @@ to keep in a view hierarchy. A <code>ViewStub</code> can be best described as a inflated and added to the user interface only when you decide so.</p> <p>The following screenshot comes from the <a -href="http://code.google/p/shelves">Shelves</a> application. The main purpose of +href="http://code.google.com/p/shelves">Shelves</a> application. The main purpose of the activity shown in the screenshot is to present the user with a browsable list of books:</p> diff --git a/docs/html/resources/tutorials/images/hello_world_0.png b/docs/html/resources/tutorials/images/hello_world_0.png Binary files differindex 330a07c74760..2674045a73c7 100644 --- a/docs/html/resources/tutorials/images/hello_world_0.png +++ b/docs/html/resources/tutorials/images/hello_world_0.png diff --git a/docs/html/resources/tutorials/images/hello_world_1.png b/docs/html/resources/tutorials/images/hello_world_1.png Binary files differindex 1ff8e2b2b825..dc4b4ad3eb21 100644 --- a/docs/html/resources/tutorials/images/hello_world_1.png +++ b/docs/html/resources/tutorials/images/hello_world_1.png diff --git a/docs/html/sdk/adding-components.jd b/docs/html/sdk/adding-components.jd index d2e55d8e536a..ca27bbad0a72 100644 --- a/docs/html/sdk/adding-components.jd +++ b/docs/html/sdk/adding-components.jd @@ -132,7 +132,7 @@ panel of the Android SDK and AVD Manager. </li> <p>When you see that a new revision is available, you can use the Android SDK and AVD Manager to quickly download it to your environment. Follow the same -procedure as given in <a href="">Installing SDK Components</a>, above. The new +procedure as given in <a href="#InstallingComponents">Installing SDK Components</a>, above. The new component is installed in place of the old, but without impacting your applications. </p> diff --git a/docs/html/sdk/android-2.3.jd b/docs/html/sdk/android-2.3.jd index 5b4f17bfddcb..9ef7847007a6 100644 --- a/docs/html/sdk/android-2.3.jd +++ b/docs/html/sdk/android-2.3.jd @@ -124,7 +124,7 @@ in {@sdkPlatformVersion}, including new features and changes in the framework API since the previous version.</p> -<h3 id="sip">SIP-based VoIP</h3> +<h3 id="sip">SIP-based VOIP</h3> <p>The platform now includes a SIP protocol stack and framework API that lets developers build internet telephony applications. Using the API, applications can offer @@ -679,7 +679,8 @@ removes several classes that were previously deprecated.</li> <ul> <li>New <code>xlargeScreens</code> attribute for <a -href="{@docRoot}guide/topics/manifest/supports-screens.html"><code><supports-screens></code></a> +href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><code><supports-screens>< +/ code > < /a> element, to indicate whether the application supports extra large screen form-factors. For details, see <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple @@ -747,7 +748,7 @@ gyroscope sensor.</li> <li>{@link android.content.pm.PackageManager#FEATURE_SIP android.software.sip} — The application uses the SIP API on the device.</li> <li>{@link android.content.pm.PackageManager#FEATURE_SIP_VOIP -android.software.sip.voip} — The application uses a SIP-based VoIP +android.software.sip.voip} — The application uses a SIP-based VOIP service on the device.</li> <li>{@link android.content.pm.PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd index 2c8e4c206fed..19f4d02720b7 100644 --- a/docs/html/sdk/ndk/index.jd +++ b/docs/html/sdk/ndk/index.jd @@ -299,7 +299,8 @@ padding: .25em 1em; <p>Before you get started make sure that you have downloaded the latest <a href= "{@docRoot}sdk/index.html">Android SDK</a> and upgraded your applications and environment as needed. The NDK is compatible with older platform versions but not older versions of the SDK tools. - Also, take a moment to review the <a href="{@docRoot}sdk/ndk/reqs.html">System and Software Requirements</a> + Also, take a moment to review the <a href="{@docRoot}sdk/ndk/overview.html#reqs">System and +Software Requirements</a> for the NDK, if you haven't already.</p> <p>To install the NDK, follow these steps:</p> diff --git a/docs/html/sdk/win-usb.jd b/docs/html/sdk/win-usb.jd index 37d2cbbdfad0..8ea70881e682 100644 --- a/docs/html/sdk/win-usb.jd +++ b/docs/html/sdk/win-usb.jd @@ -160,7 +160,7 @@ so before continuing with the driver installation. </p> <a href="adding-components.html">Adding SDK Components</a> to launch the Android SDK and AVD Manager. From the <strong>Available Packages</strong> panel, select "Usb Driver Package" and download it to your computer. The driver files are -downloaded into the <code><sdk>\usb_driver</code> directory.</p> +downloaded into the <code><sdk>\google-usb_driver\</code> directory.</p> <p>After the download, follow the instructions below to install or upgrade the driver, based on your needs and Windows operating system version. If you are |
