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

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

am 6224f2e7: am f2134151: api overview edits

* commit '6224f2e7':
  api overview edits
parents ee672b8e 6224f2e7
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ sdk.platform.apiLevel=18
<li><a href="{@docRoot}sdk/api_diff/18/changes.html">API
Differences Report &raquo;</a> </li>
<li><a
href="{@docRoot}tools/extras/support-library.html">Support Library</a></li>
href="{@docRoot}tools/support-library/index.html">Support Library</a></li>
</ol>

</div>
@@ -584,7 +584,13 @@ tag and the {@code android:glEsVersion} attribute. For example:</p>
&lt;/manifest>
</pre>

<p>And remember to specify the OpenGL ES context by calling {@link android.opengl.GLSurfaceView#setEGLContextClientVersion setEGLContextClientVersion()}, passing {@code 3} as the version.</p>
<p>And remember to specify the OpenGL ES context by calling {@link
android.opengl.GLSurfaceView#setEGLContextClientVersion setEGLContextClientVersion()},
passing {@code 3} as the version.</p>

<p>For more information about using OpenGL ES, including how to check the device's supported
OpenGL ES version at runtime, see the <a href="{@docRoot}guide/topics/graphics/opengl.html"
>OpenGL ES</a> API guide.</p>


<h3 id="MipMap">Mipmapping for drawables</h3>
+3 −4
Original line number Diff line number Diff line
page.title=Action Bar
page.tags="actionbar","menu"
parent.title=User Interface
parent.link=index.html

@jd:body


@@ -89,7 +88,7 @@ design guide.</p>

<p>The {@link android.app.ActionBar} APIs were first added in Android 3.0 (API level 11) but they
are also available in the <a href="{@docRoot}tools/support-library/index.html">Support Library</a>
for compatibility with Android 2.2 (API level 7) and above.</p>
for compatibility with Android 2.1 (API level 7) and above.</p>

<p><b>This guide focuses on how to use the
support library's action bar</b>, but if your app supports <em>only</em> Android 3.0 or higher, you
@@ -133,7 +132,7 @@ Library Setup</a>.</p>
  </li>
</ol>

<p>Now your activity includes the action bar when running on Android 2.2 (API level 7) or higher.
<p>Now your activity includes the action bar when running on Android 2.1 (API level 7) or higher.
</p>

<div class="note">