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

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

am 63768336: am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo

parents d4ef2973 63768336

docs/html/guide/appendix/install-location.jd

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ Level 8:</p> 
<ol>

  <li>Include the {@code android:installLocation} attribute with a value of "{@code auto}" or

"{@code preferExternal}" in the <code><a

href="{@docRoog}guide/topics/manifest/uses-sdk-element.html">&lt;manifest&gt;</a></code>

href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;manifest&gt;</a></code>

element.</li>

  <li>Leave your {@code android:minSdkVersion} attribute as is (something <em>less

than</em> "8") and be certain that your application code uses only APIs compatible with that

docs/html/guide/appendix/market-filters.jd

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ devices that have normal or large screens. </p> 


<p>This behavior is especially significant for applications that set their

<code><a

href="@docRoot}guide/topics/manifest/uses-sdk-element.html">android:

href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">android:

minSdkVersion</a></code> to 3 or lower, since Market will filter them from

small-screen devices by default. Such applications can enable support for

small-screen devices by adding a <code>android:targetSdkVersion="4"</code>
@@ -164,7 +164,7 @@ of corresponding screen size.</li> 
    <p>For more information on how to declare support for screen sizes in your

    application, see <code><a

    href="{@docRoot}guide/topics/manifest/supports-screens-element.html">&lt;supports-screens&gt;</a></code>

    and <a href="{@docRoot}guide/practices/screens-support.html">Supporting Multiple

    and <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple

    Screens</a>.</p>

</td>

  </tr>

docs/html/guide/topics/resources/accessing-resources.jd

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ required when referencing resources from your own package).</li> 
without the extension or the {@code android:name} attribute value in the XML element (for simple

values).</li>

</ul>

<p>See <a href="resource-types.html">Resource Types</a> for

<p>See <a href="available-resources.html">Resource Types</a> for

more information about each resource type and how to reference them.</p>
@@ -219,7 +219,7 @@ without the extension or the {@code android:name} attribute value in the XML ele 
values).</li>

</ul>



<p>See <a href="resource-types.html">Resource Types</a> for

<p>See <a href="available-resources.html">Resource Types</a> for

more information about each resource type and how to reference them.</p>

docs/html/guide/topics/resources/layout-resource.jd

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ or {@code "wrap_content"}). See the <a href="#layoutvalues">valid values</a> bel 
      {@link android.view.ViewGroup}. For a reference of all available attributes,

      see the corresponding reference documentation for the {@link android.view.ViewGroup} class

(for example, the <a

      href="{@docRoot}reference/android/widget/LinearLayout#lattrs">LinearLayout XML attributes</a>).</p>

      href="{@docRoot}reference/android/widget/LinearLayout.html#lattrs">LinearLayout XML

attributes</a>).</p>

    </dd>

  <dt id="view-element"><code>&lt;View&gt;</code></dt>

    <dd>An individual UI component, generally referred to as a "widget". Different

docs/html/guide/topics/resources/localization.jd

+3 −3
Original line number Diff line number Diff line
@@ -317,11 +317,11 @@ will prefer an MCC match over a language match. </p> 


<p>The selection process is not always as straightforward as these examples

suggest. Please read  <a

href="{@docRoot}guide/topics/resources/creating-resources.html#BestMatch">How Android Finds

href="{@docRoot}guide/topics/resources/providing-resources.html#BestMatch">How Android Finds

the Best-matching Resource</a> for a more nuanced description of the

process. All the qualifiers are described and listed in order of

precedence in <a

href="{@docRoot}guide/topics/resources/creating-resources.html#table2">Table 2 of Providing

href="{@docRoot}guide/topics/resources/providing-resources.html#table2">Table 2 of Providing

Alternative Resources</a>.</p>



<h3 id="referring-to-resources">Referring to Resources in Java</h3>
@@ -330,7 +330,7 @@ Alternative Resources</a>.</p> 
<code>R.<em>resource_type</em>.<em>resource_name</em></code> or

<code>android.R.<em>resource_type</em>.<em>resource_name</em></code><em>.</em>

For more about this, see <a

href="{@docRoot}guide/topics/resources/using-resources.html">Accessing Resources</a>.</p>

href="{@docRoot}guide/topics/resources/accessing-resources.html">Accessing Resources</a>.</p>



<h2 id="strategies">Localization Strategies</h2>