Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bca68970: am 0d9d5831: Merge "fix more broken links" into jb-dev

Browse Source 
* commit 'bca689703da6f64bfee05dd204149d0f40762344':
  fix more broken links
This commit is contained in:
Scott Main
2012-08-01 10:06:29 -07:00
committed by Android Git Automerger
parent 28e000ef72 bca689703d
commit b8babd6837
13 changed files with 35 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/html/about/versions/android-1.6-highlights.jd
View File

@@ -49,17 +49,17 @@ This page provides an overview of some new features and technologies.</p>
<!-- screenshots float right -->
<div class="screenshot">
<img src="images/search.png" class="screenshot" alt="" /><br/>
<img src="{@docRoot}sdk/images/search.png" class="screenshot" alt="" /><br/>
Quick Search Box
</div>
<div class="screenshot">
<img src="images/camera.png" class="screenshot" alt="" /><br/>
<img src="{@docRoot}sdk/images/camera.png" class="screenshot" alt="" /><br/>
New Camera/Camcorder UI
</div>
<div class="screenshot">
<img src="images/battery.png" class="screenshot" alt="" /><br/>
<img src="{@docRoot}sdk/images/battery.png" class="screenshot" alt="" /><br/>
Battery Usage Indicator
</div>
@@ -121,7 +121,7 @@ on the new accessibility framework and enable them in Settings.</p>
<h2 id="GooglePlayUpdates" style="clear:right">Google Play Updates</h2>
<div class="screenshot" style="margin-top:-35px">
<img src="images/market.png" class="screenshot" alt="" /><br/>
<img src="{@docRoot}sdk/images/market.png" class="screenshot" alt="" /><br/>
New Google Play UI
</div>

10
docs/html/about/versions/android-2.0-highlights.jd
View File

@@ -54,27 +54,27 @@ and technologies in Android 2.0.</p>
<!-- screenshots float right -->
<div class="screenshot">
<img src="images/2.0/quick-connect.png" class="screenshot" alt="" /><br/>
<img src="{@docRoot}sdk/images/2.0/quick-connect.png" class="screenshot" alt="" /><br/>
Quick Contact for Android
</div>
<div class="screenshot second">
<img src="images/2.0/multiple-accounts.png" class="screenshot" alt="" /><br/>
<img src="{@docRoot}sdk/images/2.0/multiple-accounts.png" class="screenshot" alt="" /><br/>
Multiple Accounts
</div>
<div class="screenshot">
<img src="images/2.0/mms-search.png" class="screenshot" alt="" /><br/>
<img src="{@docRoot}sdk/images/2.0/mms-search.png" class="screenshot" alt="" /><br/>
Messaging Search
</div>
<div class="screenshot second">
<img src="images/2.0/email-inbox.png" class="screenshot" alt="" /><br/>
<img src="{@docRoot}sdk/images/2.0/email-inbox.png" class="screenshot" alt="" /><br/>
Email Combined Inbox
</div>
<div class="screenshot">
<img src="images/2.0/camera-modes.png" class="screenshot" alt="" /><br/>
<img src="{@docRoot}sdk/images/2.0/camera-modes.png" class="screenshot" alt="" /><br/>
Camera Modes
</div>

12
docs/html/about/versions/android-2.2-highlights.jd
View File

@@ -71,7 +71,7 @@ href="android-2.2.html#api">Android 2.2 version notes</a>.</p>
<table class="columns" style="max-width:800px">
<tr>
<td>
<img src="images/2.2/22home.png" alt="" height=230 />
<img src="{@docRoot}sdk/images/2.2/22home.png" alt="" height=230 />
</td>
<td>
<p style="margin-top:0">New Home screen <span class="green">tips widget</span> assists new users on
@@ -103,7 +103,7 @@ easily set up and sync an Exchange account (available for Exchange 2007 and high
application, enabling users to auto-complete recipient names from the directory.</p>
</td>
<td>
<img src="images/2.2/22exchange.png" alt="" height=300 />
<img src="{@docRoot}sdk/images/2.2/22exchange.png" alt="" height=300 />
</td>
</tr>
</table>
@@ -114,7 +114,7 @@ application, enabling users to auto-complete recipient names from the directory.
<table class="columns" style="max-width:800px">
<tr>
<td>
<img src="images/2.2/22gallery.png" alt="" height=220 />
<img src="{@docRoot}sdk/images/2.2/22gallery.png" alt="" height=220 />
</td>
<td>
<p>Gallery allows you to <span class="green">peek into picture stacks</span> using a zoom
@@ -141,7 +141,7 @@ connecting their phone to the computer with a USB cable. The connection is then
two devices.</p>
</td>
<td>
<img src="images/2.2/22hotspot.png" alt="" height=180 />
<img src="{@docRoot}sdk/images/2.2/22hotspot.png" alt="" height=180 />
</td>
</tr>
</table>
@@ -152,7 +152,7 @@ two devices.</p>
<table class="columns" style="max-width:800px">
<tr>
<td>
<img src="images/2.2/22keyboard.png" alt="" height=220 />
<img src="{@docRoot}sdk/images/2.2/22keyboard.png" alt="" height=220 />
</td>
<td>
<p>Multi-lingual users can add multiple languages to the keyboard and <span class="green">switch
@@ -179,7 +179,7 @@ faster.</p>
which results in faster app switching and smoother performance on memory-constrained devices.</p>
</td>
<td>
<img src="images/2.2/jit-graph.png" alt="" height=200 />
<img src="{@docRoot}sdk/images/2.2/jit-graph.png" alt="" height=200 />
</td>
</tr>
</table>

2
docs/html/about/versions/android-2.2.jd
View File

@@ -117,7 +117,7 @@ settings.</p>
<p>For more information about setting a preferred install location for your
application, including a discussion of what types of applications should and
should not request external installation, please read the <a
href="{@docRoot}guide/appendix/install-location.html">App Install Location</a>
href="{@docRoot}guide/topics/data/install-location.html">App Install Location</a>
document. </p>
<h3 id="backup-manager">Data backup</h3>

4
docs/html/about/versions/android-2.3.3.jd
View File

@@ -122,8 +122,8 @@ NFC. To request filtering, add
<code>&lt;uses-feature android:name="android.hardware.nfc"
android:required="true"&gt;</code> to the application's manifest.</p>
<p class="note">To look at sample code for NFC, see
<a href="{@docRoot}resources/samples/NFCDemo/index.html">NFCDemo app</a>, <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/nfc/TechFilter.html">filtering by tag technology</a></li>, <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/nfc/ForegroundDispatch.html">using foreground dispatch</a>, and <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/nfc/ForegroundNdefPush.html">foreground NDEF push (P2P)</a>.</p>
<p class="note">For more information, read the
<a href="{@docRoot}guide/topics/connectivity/nfc/index.html">NFC</a> developer guide.</p>
<h3 id="bluetooth">Bluetooth</h3>

4
docs/html/about/versions/android-2.3.jd
View File

@@ -76,8 +76,8 @@ android:name="android.software.sip"
android:required="true"&gt;</code> and <code>&lt;uses-feature
android:name="android.software.sip.voip"&gt;</code> to the application manifest.</p>
<p class="note">To look at a sample application that uses the SIP API, see <a
href="{@docRoot}resources/samples/SipDemo/index.html">SIP Demo</a>.</p>
<p class="note">For more information, read the <a
href="{@docRoot}guide/topics/connectivity/sip.html">SIP</a> developer guide.</p>
<h3 id="nfc">Near Field Communications (NFC)</h3>

11
docs/html/guide/components/fragments.jd
View File

@@ -45,17 +45,10 @@ parent.link=activities.html
<li>{@link android.app.FragmentManager}</li>
<li>{@link android.app.FragmentTransaction}</li>
</ol>
<h2>Related samples</h2>
<ol>
<li><a
href="{@docRoot}resources/samples/HoneycombGallery/index.html">Honeycomb Gallery</a></li>
<li><a
href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/index.html#Fragment">ApiDemos</a></li>
</ol>
<h2>See also</h2>
<ol>
<li><a href="{@docRoot}training/basics/fragments/index.html">Building a Dynamic UI with Fragments</a></li>
<li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">Supporting Tablets
and Handsets</a></li>
</ol>
@@ -834,7 +827,7 @@ then rotates to landscape (which restarts the current activity).</p>
<p>For more samples using fragments (and complete source files for this example),
see the sample code available in <a
see the API Demos sample app available in <a
href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/index.html#Fragment">
ApiDemos</a> (available for download from the <a
href="{@docRoot}resources/samples/get.html">Samples SDK component</a>).</p>

2
docs/html/guide/google/play/expansion-files.jd
View File

@@ -262,7 +262,7 @@ are on the device upon start-up. If the files are not on the device, use Google
href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a> service to request URLs
for the expansion files, then download and save them.
<p>To greatly reduce the amount of code you must write and ensure a good user experience
during the download, we recommend you use the <a href="AboutLibraries">Downloader
during the download, we recommend you use the <a href="#AboutLibraries">Downloader
Library</a> to implement your download behavior.</p>
<p>If you build your own download service instead of using the library, be aware that you
must not change the name of the expansion files and must save them to the proper

2
docs/html/guide/practices/optimizing-for-3.0.jd
View File

@@ -118,7 +118,7 @@ Manager</a> and install the following:
<li>Samples for SDK API 11</li>
</ul>
</li>
<li><a href="{@docRoot}guide/developing/other-ide.html#AVD">Create an AVD</a> for a tablet-type
<li><a href="{@docRoot}tools/devices/managing-avds.html">Create an AVD</a> for a tablet-type
device:
<p>Set the target to "Android 3.0" and the skin to "WXGA" (the default skin).</p></li>
</ol>

19
docs/html/guide/topics/graphics/opengl.jd
View File

@@ -84,11 +84,8 @@ understanding how to implement these classes in an activity should be your first
this class by creating an instance of {@link android.opengl.GLSurfaceView} and adding your
{@link android.opengl.GLSurfaceView.Renderer Renderer} to it. However, if you want to capture
touch screen events, you should extend the {@link android.opengl.GLSurfaceView} class to
implement the touch listeners, as shown in OpenGL Tutorials for
<a href="{@docRoot}resources/tutorials/opengl/opengl-es10.html#touch">ES 1.0</a>,
<a href="{@docRoot}resources/tutorials/opengl/opengl-es20.html#touch">ES 2.0</a> and the <a
href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.html"
>TouchRotateActivity</a> sample.</dd>
implement the touch listeners, as shown in OpenGL training lesson,
<a href="{@docRoot}training/graphics/opengl/touch.html">Responding to Touch Events</a>.</dd>
<dt><strong>{@link android.opengl.GLSurfaceView.Renderer}</strong></dt>
<dd>This interface defines the methods required for drawing graphics in an OpenGL {@link
@@ -164,9 +161,8 @@ interface to OpenGL ES 2.0 and is available starting with Android 2.2 (API Level
</li>
</ul>
<p>If you'd like to start building an app with OpenGL right away, have a look at the tutorials for
<a href="{@docRoot}resources/tutorials/opengl/opengl-es10.html">OpenGL ES 1.0</a> or
<a href="{@docRoot}resources/tutorials/opengl/opengl-es20.html">OpenGL ES 2.0</a>!
<p>If you'd like to start building an app with OpenGL right away, follow the
<a href="{@docRoot}training/graphics/opengl/index.html">Displaying Graphics with OpenGL ES</a> class.
</p>
<h2 id="manifest">Declaring OpenGL Requirements</h2>
@@ -277,10 +273,6 @@ which simulates a camera position.
</li>
</ol>
<p>For a complete example of how to apply projection and camera views with OpenGL ES 1.0, see the <a
href="{@docRoot}resources/tutorials/opengl/opengl-es10.html#projection-and-views">OpenGL ES 1.0
tutorial</a>.</p>
<h3 id="proj-es2">Projection and camera view in OpenGL ES 2.0</h3>
<p>In the ES 2.0 API, you apply projection and camera view by first adding a matrix member to
@@ -382,8 +374,7 @@ objects to be rendered by OpenGL.
</li>
</ol>
<p>For a complete example of how to apply projection and camera view with OpenGL ES 2.0, see the <a
href="{@docRoot}resources/tutorials/opengl/opengl-es20.html#projection-and-views">OpenGL ES 2.0
tutorial</a>.</p>
href="{@docRoot}training/graphics/opengl/index.html">Displaying Graphics with OpenGL ES</a> class.</p>
<h2 id="faces-winding">Shape Faces and Winding</h2>

2
docs/html/guide/topics/manifest/manifest-element.jd
View File

@@ -175,7 +175,7 @@ multiple SD cards can be used with the same device.</li>
storage. However, the system will not allow the user to move the application to external storage if
this attribute is set to {@code internalOnly}, which is the default setting.</p>
<p>Read <a href="{@docRoot}guide/appendix/install-location.html">App Install Location</a> for
<p>Read <a href="{@docRoot}guide/topics/data/install-location.html">App Install Location</a> for
more information about using this attribute (including how to maintain backward compatibility).</p>
<p>Introduced in: API Level 8.</p>

4
docs/html/guide/topics/resources/accessing-resources.jd
View File

@@ -336,6 +336,6 @@ android.widget.ArrayAdapter}&lt;String&gt;(this, <strong>android.R.layout.simple
<p>In this example, {@link android.R.layout#simple_list_item_1} is a layout resource defined by the
platform for items in a {@link android.widget.ListView}. You can use this instead of creating
your own layout for list items. (For more about using {@link android.widget.ListView}, see the
<a href="{@docRoot}resources/tutorials/views/hello-listview.html">List View Tutorial</a>.)</p>
your own layout for list items. For more information, see the
<a href="{@docRoot}guide/topics/ui/layout/listview.html">List View</a> developer guide.</p>

9
docs/html/guide/topics/security/security.jd
View File

@@ -135,8 +135,7 @@ dynamic permission grants on a case-by-case basis.</p>
<p>To provide additional protection for sensitive data, some applications
choose to encrypt local files using a key that is not accessible to the
application. (For example, a key can be placed in a <code><a
href={@docRoot}reference/java/security/KeyStore.html">KeyStore</a></code> and
application. (For example, a key can be placed in a {@link java.security.KeyStore} and
protected with a user password that is not stored on the device). While this
does not protect data from a root compromise that can monitor the user
inputting the password, it can provide protection for a lost device without <a
@@ -717,8 +716,7 @@ href="{@docRoot}reference/android/accounts/AccountManager.html">
AccountManager</a></code> using <code><a
href="{@docRoot}reference/android/content/pm/PackageManager.html#checkSignatures(java.lang.String,%20java.lang.String)">checkSignature()</a></code>.
Alternatively, if only one application will use the credential, you might use a
<code><a
href={@docRoot}reference/java/security/KeyStore.html">KeyStore</a></code> for
{@link java.security.KeyStore} for
storage.</p>
<a name="Crypto"></a>
@@ -752,8 +750,7 @@ href="{@docRoot}reference/javax/crypto/KeyGenerator.html">
number generator significantly weakens the strength of the algorithm, and may
allow offline attacks.</p>
<p>If you need to store a key for repeated use, use a mechanism like <code><a
href="{@docRoot}reference/java/security/KeyStore.html">KeyStore</a></code> that
<p>If you need to store a key for repeated use, use a mechanism like {@link java.security.KeyStore} that
provides a mechanism for long term storage and retrieval of cryptographic
keys.</p>