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

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

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

* commit 'bca68970':
  fix more broken links
parents 28e000ef bca68970

docs/html/about/versions/android-1.6-highlights.jd

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

docs/html/about/versions/android-2.0-highlights.jd

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

docs/html/about/versions/android-2.2-highlights.jd

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

docs/html/about/versions/android-2.2.jd

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

docs/html/about/versions/android-2.3.3.jd

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