diff options
| -rw-r--r-- | docs/html/about/versions/android-4.3.jd | 10 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/actionbar.jd | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/docs/html/about/versions/android-4.3.jd b/docs/html/about/versions/android-4.3.jd index d0ccfbe..132356a 100644 --- a/docs/html/about/versions/android-4.3.jd +++ b/docs/html/about/versions/android-4.3.jd @@ -109,7 +109,7 @@ sdk.platform.apiLevel=18 <li><a href="{@docRoot}sdk/api_diff/18/changes.html">API Differences Report »</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> </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> diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index 453d9d7..34cf2a8 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -1,7 +1,6 @@ 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"> |