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

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

Merge "docs: misc changes to overview and add known issues link to sdk tools notes" into ics-mr0

parents e6fee18d e0974327

docs/html/resources/resources-data.js

+1 −1
Original line number Original line Diff line number Diff line
@@ -428,7 +428,7 @@ var ANDROID_RESOURCES = [ 
    }

    }

  },

  },

  {

  {

    tags: ['sample', 'layout', 'ui'],

    tags: ['sample', 'layout', 'ui', 'updated'],

    path: 'samples/ApiDemos/index.html',

    path: 'samples/ApiDemos/index.html',

    title: {

    title: {

      en: 'API Demos'

      en: 'API Demos'

docs/html/sdk/android-4.0.jd

+4 −4
Original line number Original line Diff line number Diff line
@@ -100,8 +100,8 @@ class="toggle-content-img" alt="" /> 
      <li><a href="#Multimedia">Multimedia</a></li>

      <li><a href="#Multimedia">Multimedia</a></li>

      <li><a href="#Bluetooth">Bluetooth</a></li>

      <li><a href="#Bluetooth">Bluetooth</a></li>

      <li><a href="#AndroidBeam">Android Beam (NDEF Push with NFC)</a></li>

      <li><a href="#AndroidBeam">Android Beam (NDEF Push with NFC)</a></li>

      <li><a href="#P2pWiFi">Peer-to-peer Wi-Fi</a></li>

      <li><a href="#WiFiDirect">Wi-Fi Direct</a></li>

      <li><a href="#NetworkData">Network Data</a></li>

      <li><a href="#NetworkUsage">Network Usage</a></li>

      <li><a href="#RenderScript">RenderScript</a></li>

      <li><a href="#RenderScript">RenderScript</a></li>

      <li><a href="#A11y">Accessibility</a></li>

      <li><a href="#A11y">Accessibility</a></li>

      <li><a href="#Enterprise">Enterprise</a></li>

      <li><a href="#Enterprise">Enterprise</a></li>
@@ -653,7 +653,7 @@ Beam Demo</a> sample app.</p> 












<h3 id="P2pWiFi">Peer-to-peer Wi-Fi</h3>

<h3 id="WiFiDirect">Wi-Fi Direct</h3>





<p>Android now supports Wi-Fi Direct for peer-to-peer (P2P) connections between Android-powered

<p>Android now supports Wi-Fi Direct for peer-to-peer (P2P) connections between Android-powered

devices and other device types without a hotspot or Internet connection. The Android framework

devices and other device types without a hotspot or Internet connection. The Android framework
@@ -739,7 +739,7 @@ sample application.</p> 












<h3 id="NetworkData">Network Data</h3>

<h3 id="NetworkUsage">Network Usage</h3>





<p>Android 4.0 gives users precise visibility of how much network data their applications are using.

<p>Android 4.0 gives users precise visibility of how much network data their applications are using.

The Settings app provides controls that allow users to manage set limits for network data usage and

The Settings app provides controls that allow users to manage set limits for network data usage and

docs/html/sdk/eclipse-adt.jd

+3 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,9 @@ document.</p> 
<p>The sections below provide notes about successive releases of

<p>The sections below provide notes about successive releases of

the ADT Plugin, as denoted by revision number. </p>

the ADT Plugin, as denoted by revision number. </p>





<p>For a summary of all known issues in ADT, see <a

href="http://tools.android.com/release/knownissues">http://tools.android.com/release/knownissues</a>.</p>



<script type="text/javascript">

<script type="text/javascript">

function toggleDiv(link) {

function toggleDiv(link) {

  var toggleable = $(link).parent();

  var toggleable = $(link).parent();

docs/html/sdk/tools-notes.jd

+3 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,9 @@ the SDK Tools, as denoted by revision number. To determine what revision of the 
Tools you are using, refer to the "Installed Packages" listing in the Android SDK

Tools you are using, refer to the "Installed Packages" listing in the Android SDK

and AVD Manager. </p>

and AVD Manager. </p>





<p>For a summary of all known issues in SDK Tools, see <a

href="http://tools.android.com/release/knownissues">http://tools.android.com/release/knownissues</a>.</p>



<script type="text/javascript">

<script type="text/javascript">

function toggleDiv(link) {

function toggleDiv(link) {

  var toggleable = $(link).parent();

  var toggleable = $(link).parent();