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

Commit 30eefe63 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering,... 

am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb

* commit '7036d76a':
  Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr.
parents c49992c9 7036d76a

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

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ manifest file to the configurations defined by the device, as well as other fact 
<li><a

href="{@docRoot}guide/practices/compatibility.html">Android Compatibility</a></li>

<li><code><a

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

<li><code><a

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

<li><code><a

href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></code></li>
@@ -395,5 +397,12 @@ href="{@docRoot}guide/topics/manifest/supports-screens-element.html">{@code 
with alternative resources.</p>

    </td>

  </tr>

  <tr>

    <td><nobr><a href="{@docRoot}guide/topics/manifest/supports-gl-texture-element.html">{@code

&lt;supports-gl-texture&gt;}</a></nobr></td>

    <td>

      <p>Android Market filters the application unless one or more of the GL texture compression formats supported by the application are also supported by the device. </p>

    </td>

  </tr>

</table>

docs/html/guide/guide_toc.cs

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ 
          <li><a href="<?cs var:toroot ?>guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/manifest/service-element.html">&lt;service&gt;</a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/manifest/supports-gl-texture-element.html">&lt;supports-gl-texture&gt;</a></li> 

          <li><a href="<?cs var:toroot ?>guide/topics/manifest/supports-screens-element.html">&lt;supports-screens&gt;</a></li>  <!-- ##api level 4## -->

          <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-feature-element.html">&lt;uses-feature&gt;</a></li> <!-- ##api level 4## -->

docs/html/guide/topics/manifest/activity-element.jd

+19 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ page.title=&lt;activity&gt; 
          android:<a href="#exclude">excludeFromRecents</a>=["true" | "false"]

          android:<a href="#exported">exported</a>=["true" | "false"]

          android:<a href="#finish">finishOnTaskLaunch</a>=["true" | "false"]

          android:<a href="#hwaccel">hardwareAccelerated</a>=["true" | "false"]

          android:<a href="#icon">icon</a>="<i>drawable resource</i>"

          android:<a href="#label">label</a>="<i>string resource</i>"

          android:<a href="#lmode">launchMode</a>=["multiple" | "singleTop" |
@@ -286,6 +287,24 @@ are both "{@code true}", this attribute trumps the other. The affinity of the 
activity is ignored.  The activity is not re-parented, but destroyed.

</p>



<dt><a name="hwaccel"></a>{@code android:hardwareAccelerated}</dt>

<dd>Whether or not hardware-accelerated rendering should be enabled for this

Activity &mdash; "{@code true}" if it should be enabled, and "{@code false}" if

not. The default value is "{@code false}".



<p>Starting from Android 3.0, a hardware-accelerated OpenGL renderer is

available to applications, to improve performance for many common 2D graphics

operations. When the hardware-accelerated renderer is enabled, most operations

in Canvas, Paint, Xfermode, ColorFilter, Shader, and Camera are accelerated.

This results in smoother animations, smoother scrolling, and improved

responsiveness overall, even for applications that do not explicitly make use

the framework's OpenGL libraries. </p>



<p>Note that not all of the OpenGL 2D operations are accelerated. If you enable

the hardware-accelerated renderer, test your application to ensure that it can

make use of the renderer without errors.</p>

</dd>



<dt><a name="icon"></a>{@code android:icon}</dt>

<dd>An icon representing the activity. The icon is displayed to users when 

a representation of the activity is required on-screen.  For example, icons

docs/html/guide/topics/manifest/application-element.jd

+21 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ page.title=&lt;application&gt; 
             android:<a href="#desc">description</a>="<i>string resource</i>"

             android:<a href="#enabled">enabled</a>=["true" | "false"]

             android:<a href="#code">hasCode</a>=["true" | "false"]

             android:<a href="#hwaccel">hardwareAccelerated</a>=["true" | "false"]

             android:<a href="#icon">icon</a>="<i>drawable resource</i>"

             android:<a href="#killrst">killAfterRestore</a>=["true" | "false"]

             android:<a href="#label">label</a>="<i>string resource</i>"
@@ -108,7 +109,26 @@ The default value is "{@code true}". 
<p>

An application would not have any code of its own only if it's using nothing

but built-in component classes, such as an activity that uses the {@link 

android.app.AliasActivity} class, a rare occurrence.

android.app.AliasActivity} class, a rare occurrence.</p>

</dd>



<dt><a name="hwaccel"></a>{@code android:hardwareAccelerated}</dt>

<dd>Whether or not hardware-accelerated rendering should be enabled for all

Activities and Views in this application &mdash; "{@code true}" if it

should be enabled, and "{@code false}" if not. The default value is "{@code false}".



<p>Starting from Android 3.0, a hardware-accelerated OpenGL renderer is

available to applications, to improve performance for many common 2D graphics

operations. When the hardware-accelerated renderer is enabled, most operations

in Canvas, Paint, Xfermode, ColorFilter, Shader, and Camera are accelerated.

This results in smoother animations, smoother scrolling, and improved

responsiveness overall, even for applications that do not explicitly make use

the framework's OpenGL libraries. </p>



<p>Note that not all of the OpenGL 2D operations are accelerated. If you enable

the hardware-accelerated renderer, test your application to ensure that it can

make use of the renderer without errors.</p>

</dd>



<dt><a name="icon"></a>{@code android:icon}</dt>

<dd>An icon for the application as whole, and the default icon for

docs/html/guide/topics/manifest/manifest-intro.jd

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ other mention of the element name. 
    <a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration /&gt;</a>  <!-- ##api level 3## -->

    <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">&lt;uses-feature /&gt;</a>  <!-- ##api level 4## -->

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

    <a href="{@docRoot}guide/topics/manifest/compatible-screens-element.html">&lt;compatible-screens /&gt;</a>  <!-- ##api level 9## -->

    <a href="{@docRoot}guide/topics/manifest/supports-gl-texture-element.html">&lt;supports-gl-texture /&gt;</a>  <!-- ##api level 11## -->



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