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

Commit 90889821 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "docs: fix misc broken links" into ics-mr0

parents 49dfd814 19aad293

docs/html/guide/developing/projects/projects-cmdline.jd

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ android create project \ 
  <p class="caution"><strong>Caution:</strong> You should refrain from moving the location of the

  SDK directory, because this will break the SDK location property located in <code>local.properties</code>.

  If you need to update the SDK location, use the <code>android update project</code> command.

  See <a href="UpdatingAProject">Updating a Project</a> for more information.</p>

  See <a href="#UpdatingAProject">Updating a Project</a> for more information.</p>



  <h2 id="UpdatingAProject">Updating a Project</h2>

docs/html/guide/practices/optimizing-for-3.0.jd

+5 −5
Original line number Diff line number Diff line
@@ -411,8 +411,8 @@ href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/Acti 
>Action Bar</a>: Samples that demonstrate various Action Bar features, such as tabs, logos, and

action items.</li>

  <li><a

href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.

html">Clipboard</a>: An example of how to use the clipboard for copy and paste operations.</li>

href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.html"

>Clipboard</a>: An example of how to use the clipboard for copy and paste operations.</li>

  <li><a

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

Drag and Drop</a>: An example of how to perform drag and drop with new View events.</li>
@@ -427,11 +427,11 @@ href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/animatio 
Property Animation</a>: Several samples using the new animation APIs to animate object

properties.</li>

  <li><a

href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/SearchViewActionBar.

html">Search View Widget</a>: Example using the new search widget in the Action Bar (as an

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

Search View Widget</a>: Example using the new search widget in the Action Bar (as an

"action view").</li>

  <li><a

href="{@docRoot}resources/samples/Renderscript/index.html">Renderscript</a>: Contains several

href="{@docRoot}resources/samples/RenderScript/index.html">Renderscript</a>: Contains several

different applications that demonstrate using renderscript APIs for computations and 3D

graphics.</li>

</ul>

docs/html/guide/practices/screen-compat-mode.jd

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code 
android:minSdkVersion}</a> or <a

href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

android:targetSdkVersion}</a> to {@code "4"} or higher, or set <a

href="guide/topics/manifest/supports-screens-element.html#resizeable">{@code

href="{@docRoot}guide/topics/manifest/supports-screens-element.html#resizeable">{@code

android:resizeable}</a> to {@code "true"}.</p>

  </dd>

docs/html/guide/practices/screens_support.jd

+2 −2
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ pixels.</p> 
<img src="{@docRoot}images/screens_support/scale-test.png" alt="" />

<p class="img-caption"><strong>Figure 5.</strong> Comparison of pre-scaled and auto-scaled

bitmaps, from <a

href="resources/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.html">

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

ApiDemos</a>.

</p>

</div>
@@ -1150,7 +1150,7 @@ subtle, because all of the bitmaps are being scaled to match the current screen 
scaled bitmaps have slightly different appearances depending on whether they are pre-scaled or

auto-scaled at draw time. You can find the source code for this sample application, which

demonstrates using pre-scaled and auto-scaled bitmaps, in <a

href="resources/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.html">

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

ApiDemos</a>.</p>



<p class="note"><strong>Note:</strong> In Android 3.0 and above, there should be no perceivable

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

+2 −2
Original line number Diff line number Diff line
@@ -619,8 +619,8 @@ long pwExpiration; 
mDPM.setPasswordExpirationTimeout(mDeviceAdminSample, pwExpiration);

</pre>



<p>From the <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/

DeviceAdminSample.html"> Device Administration API sample</a>, here is the code

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

>Device Administration API sample</a>, here is the code

that updates the password expiration status:</p>



<pre>