Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a925b6a6 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df... 

am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882

* commit '93d204ed':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
parents 627b78f4 93d204ed

docs/html/guide/developing/testing/testing_otheride.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -296,7 +296,7 @@ $ android create test-project -m ../HelloAndroid -n HelloAndroidTest -p HelloAnd 
<h2 id="RunTestsCommand">Running Tests</h2>

<h2 id="RunTestsCommand">Running Tests</h2>

<p>

<p>

    You run tests from the command line, either with Ant or with an

    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.

    Android Debug Bridge (adb)</a> shell.

</p>

</p>

<h3 id="RunTestsAnt">Quick build and run with Ant</h3>

<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>

<h3 id="RunTestsDevice">Running tests on a device or emulator</h3>

<p>

<p>

    When you run tests from the command line with

    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

    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

    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

    according to their annotation, or specify testing options. Since the test run is controlled

docs/html/guide/developing/tools/emulator.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 

  <td>Enable the root shell (as in <code>-shell</code> and specify the QEMU character 

  device to use for communication with the shell.</td>

  device to use for communication with the shell.</td>

  <td>&lt;device&gt; must be a QEMU device type. See the documentation for '-serial <em>dev</em>' at 

  <td>&lt;device&gt; 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> 

  <a href="http://wiki.qemu.org/download/qemu-doc.html">wiki.qemu.org</a> 

  for a list of device types.</p>

  for more information.</p>





<p>Here are some examples: </p>

<p>Here are some examples: </p>

<ul>

<ul>

docs/html/guide/topics/admin/device-admin.jd

+4 −4
Original line number Original line Diff line number Diff line
@@ -156,14 +156,14 @@ Administration API lets you do the following:</p> <ul> 
<h2 id="sample">Sample Application</h2>

<h2 id="sample">Sample Application</h2>





<p>The examples used in this document are based on the <a

<p>The examples used in this document are based on the <a

href="{@docRoot}resources/samples/ApiDemos/src/com/example/

href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.html">

android/apis/app/DeviceAdminSample.html">Device Administration API

Device Administration API

sample</a>, which is included in the SDK samples. For information on downloading and

sample</a>, which is included in the SDK samples. For information on downloading and

installing the SDK samples, see <a

installing the SDK samples, see <a

href="{@docRoot}resources/samples/get.html">

href="{@docRoot}resources/samples/get.html">

Getting the Samples</a>. Here is the  <a

Getting the Samples</a>. Here is the  <a

href="{@docRoot}resources/samples/ApiDemos/src/com/example/

href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.html">

android/apis/app/DeviceAdminSample.html">complete code</a> for

complete code</a> for

the sample. </p>

the sample. </p>

<p>The

<p>The

sample application offers a demo of device admin features. It presents users

sample application offers a demo of device admin features. It presents users

docs/html/guide/topics/manifest/uses-feature-element.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -339,7 +339,7 @@ the feature as shown below.</p> 
<p class="caution">It's important to understand that the permissions that you

<p class="caution">It's important to understand that the permissions that you

request in <code>&lt;uses-permission&gt;</code> elements can directly affect how

request in <code>&lt;uses-permission&gt;</code> elements can directly affect how

Android Market filters your application. The reference section <a

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

below, lists the full set of permissions that imply feature requirements and

therefore trigger filtering.</p>

therefore trigger filtering.</p>

docs/html/guide/topics/resources/layout-resource.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>&lt;include&gt;</code></a> and

in another layout file using <a href="#include-element"><code>&lt;include&gt;</code></a> and

this layout doesn't require a different {@link android.view.ViewGroup} container. For more

this layout doesn't require a different {@link android.view.ViewGroup} container. For more

information about merging layouts, read <a

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>

Tricks: Merging</a>.</dd>





  </dl>

  </dl>