You run tests from the command line, either with Ant or with an - + Android Debug Bridge (adb) shell.
When you run tests from the command line with
-
+
Android Debug Bridge (adb), 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 -help-disk-images.
-shell and specify the QEMU character
device to use for communication with the shell.Here are some examples:
The examples used in this document are based on the Device Administration API +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.html"> +Device Administration API sample, which is included in the SDK samples. For information on downloading and installing the SDK samples, see Getting the Samples. Here is the complete code for +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.html"> +complete code for the sample.
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.
It's important to understand that the permissions that you
request in <uses-permission> elements can directly affect how
Android Market filters your application. The reference section Permissions that Imply Feature Requirements,
+href="#permissions-features">Permissions that Imply Feature Requirements,
below, lists the full set of permissions that imply feature requirements and
therefore trigger filtering.
<include> and
this layout doesn't require a different {@link android.view.ViewGroup} container. For more
information about merging layouts, read Layout
+href="{@docRoot}resources/articles/layout-tricks-merge.html">Layout
Tricks: Merging.
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
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 - + Testing Fundamentals.
The articles showed you how to use the <include /> tag in XML layouts, to reuse and share your layout code. This article explains the <merge /> tag and how it complements the <include /> tag.
The articles showed you how to use the <include /> tag in XML layouts, to
+reuse and share your layout code. This article explains the <merge /> tag and how
+it complements the <include /> tag.
The <merge /> 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 ViewStub can be best described as a
inflated and added to the user interface only when you decide so.
The following screenshot comes from the Shelves application. The main purpose of +href="http://code.google.com/p/shelves">Shelves application. The main purpose of the activity shown in the screenshot is to present the user with a browsable list of books:
diff --git a/docs/html/resources/tutorials/images/hello_world_0.png b/docs/html/resources/tutorials/images/hello_world_0.png index 330a07c74760..2674045a73c7 100644 Binary files a/docs/html/resources/tutorials/images/hello_world_0.png and b/docs/html/resources/tutorials/images/hello_world_0.png differ diff --git a/docs/html/resources/tutorials/images/hello_world_1.png b/docs/html/resources/tutorials/images/hello_world_1.png index 1ff8e2b2b825..dc4b4ad3eb21 100644 Binary files a/docs/html/resources/tutorials/images/hello_world_1.png and b/docs/html/resources/tutorials/images/hello_world_1.png differ 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.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 Installing SDK Components, above. The new +procedure as given in Installing SDK Components, above. The new component is installed in place of the old, but without impacting your applications.
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. -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.
xlargeScreens attribute for <supports-screens>
+href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><supports-screens><
+/ code > < /a>
element, to indicate whether the application supports
extra large screen form-factors. For details, see Supporting Multiple
@@ -747,7 +748,7 @@ gyroscope sensor.Before you get started make sure that you have downloaded the latest Android SDK 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 System and Software Requirements + Also, take a moment to review the System and +Software Requirements for the NDK, if you haven't already.
To install the NDK, follow these steps:
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. Adding SDK Components to launch the Android SDK and AVD Manager. From the Available Packages panel, select "Usb Driver Package" and download it to your computer. The driver files are -downloaded into the<sdk>\usb_driver directory.
+downloaded into the <sdk>\google-usb_driver\ directory.
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