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

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

am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 

* commit 'eb1d42e4':
  docs: Fix a bunch of misc doc issues from external tracker
parents 42ef93fc eb1d42e4

core/java/android/hardware/GeomagneticField.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.hardware; 
import java.util.GregorianCalendar;



/**

 * This class is used to estimated estimate magnetic field at a given point on

 * Estimates magnetic field at a given point on

 * Earth, and in particular, to compute the magnetic declination from true

 * north.

 *

docs/html/guide/developing/device.jd

+23 −23
Original line number Diff line number Diff line
@@ -134,11 +134,11 @@ above.</p> 
  </tr>

  <tr>

    <td>ASUS</td>

    <td><code>0B05</code></td>

    <td><code>0b05</code></td>

  </tr>

  <tr>

    <td>Dell</td>

    <td><code>413C</code></td>

    <td><code>413c</code></td>

  </tr>

  <tr>

    <td>Foxconn</td>
@@ -146,35 +146,35 @@ above.</p> 
  </tr>

  <tr>

    <td>Fujitsu</td>

    <td><code>04C5</code></td>

    <td><code>04c5</code></td>

  </tr>

  <tr>

    <td>Fujitsu Toshiba</td>

    <td><code>04C5</code></td>

    <td><code>04c5</code></td>

  </tr>

  <tr>

    <td>Garmin-Asus</td>

    <td><code>091E</code></td>

    <td><code>091e</code></td>

  </tr>

  <tr>

    <td>Google</td>

    <td><code>18D1</code></td>

    <td><code>18d1</code></td>

  </tr>

  <tr>

    <td>Hisense</td>

    <td><code>109B</code></td>

    <td><code>109b</code></td>

  </tr>

  <tr>

    <td>HTC</td>

    <td><code>0BB4</code></td>

    <td><code>0bb4</code></td>

  </tr>

  <tr>

    <td>Huawei</td>

    <td><code>12D1</code></td>

    <td><code>12d1</code></td>

  </tr>

  <tr>

    <td>K-Touch</td>

    <td><code>24E3</code></td>

    <td><code>24e3</code></td>

  </tr>

  <tr>

    <td>KT Tech</td>
@@ -185,8 +185,8 @@ above.</p> 
    <td><code>0482</code></td>

  </tr>

  <tr>

    <td>Lenevo</td>

    <td><code>17EF</code></td>

    <td>Lenovo</td>

    <td><code>17ef</code></td>

  </tr>

  <tr>

    <td>LG</td>
@@ -194,7 +194,7 @@ above.</p> 
  </tr>

  <tr>

    <td>Motorola</td>

    <td><code>22B8</code></td>

    <td><code>22b8</code></td>

  </tr>

  <tr>

    <td>NEC</td>
@@ -214,11 +214,11 @@ above.</p> 
  </tr>

  <tr>

    <td>Pantech</td>

    <td><code>10A9</code></td>

    <td><code>10a9</code></td>

  </tr>

  <tr>

    <td>Pegatron</td>

    <td><code>1D4D</code></td>

    <td><code>1d4d</code></td>

  </tr>

  <tr>

    <td>Philips</td>
@@ -226,31 +226,31 @@ above.</p> 
  </tr>

  <tr>

    <td>PMC-Sierra</td>

    <td><code>04DA</code></td>

    <td><code>04da</code></td>

  </tr>

  <tr>

    <td>Qualcomm</td>

    <td><code>05C6</code></td>

    <td><code>05c6</code></td>

  </tr>

  <tr>

    <td>SK Telesys</td>

    <td><code>1F53</code></td>

    <td><code>1f53</code></td>

  </tr>

  <tr>

    <td>Samsung</td>

    <td><code>04E8</code></td>

    <td><code>04e8</code></td>

  </tr>

  <tr>

    <td>Sharp</td>

    <td><code>04DD</code></td>

    <td><code>04dd</code></td>

  </tr>

  <tr>

    <td>Sony</td>

    <td><code>054C</code></td>

    <td><code>054c</code></td>

  </tr>

  <tr>

    <td>Sony Ericsson</td>

    <td><code>0FCE</code></td>

    <td><code>0fce</code></td>

  </tr>

  <tr>

    <td>Teleepoch</td>
@@ -262,6 +262,6 @@ above.</p> 
  </tr>

  <tr>

    <td>ZTE</td>

    <td><code>19D2</code></td>

    <td><code>19d2</code></td>

  </tr>

</table>

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

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ Table 1 explains the flags and arguments. 
    You can generate an API reference for monkeyrunner by running:

</p>

<pre>

monkeyrunner &lt;format&gt; help.py &lt;outfile&gt;

monkeyrunner help.py &lt;format&gt; &lt;outfile&gt;

</pre>

<p>

The arguments are:

docs/html/guide/market/expansion-files.jd

+2 −6
Original line number Diff line number Diff line
@@ -1088,12 +1088,8 @@ android.content.res.AssetFileDescriptor}, such as some {@link android.media.Medi 
    <dd>Most applications don't need to use this class. This class defines a {@link

android.content.ContentProvider} that marshals the data from the ZIP files through a content

provider {@link android.net.Uri} in order to provide file access for certain Android APIs that

expect {@link android.net.Uri} access to media files.

      <p>The sample application available in the

Apk Expansion package demonstrates a scenario in which this class is useful

to specify a video with {@link android.widget.VideoView#setVideoURI

VideoView.setVideoURI()}. See the sample app's class {@code SampleZipfileProvider} for an

example of how to extend this class to use in your application.</p></dd>

expect {@link android.net.Uri} access to media files. For example, this is useful if you want to

play a video with {@link android.widget.VideoView#setVideoURI VideoView.setVideoURI()}.</p></dd>

</dl>



<h4>Reading from a ZIP file</h4>

docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ See the following section about <a href="#ActivityState">Activity state</a>.</p> 


<p>Because the activities in the back stack are never rearranged, if your application allows

users to start a particular activity from more than one activity, a new instance of

that activity is created and popped onto the stack (rather than bringing any previous instance of

that activity is created and pushed onto the stack (rather than bringing any previous instance of

the activity to the top). As such, one activity in your application might be instantiated multiple

times (even from different tasks), as shown in figure 3. As such, if the user navigates backward

using the <em>Back</em> button, each instance of the activity is revealed in the order they were
@@ -291,7 +291,7 @@ B should associate with current task. If both activities define how Activity B 
should associate with a task, then Activity A's request (as defined in the intent) is honored

over Activity B's request (as defined in its manifest).</p>



<p class="note"><strong>Note:</strong> Some the launch modes available in the manifest

<p class="note"><strong>Note:</strong> Some launch modes available for the manifest file

are not available as flags for an intent and, likewise, some launch modes available as flags

for an intent cannot be defined in the manifest.</p>