LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'e897c1b4' into manualmerge

Browse Source 
Conflicts:
	samples/ApiDemos/src/com/example/android/apis/app/_index.html
This commit is contained in:
Dirk Dougherty
2009-12-15 23:27:22 -08:00
parent 7a41627710 e897c1b428
commit a276296490
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/ApiDemos/src/com/example/android/apis/graphics/_index.html
View File

@@ -16,7 +16,7 @@
<dt>Code:
<dd><a href="GLSurfaceViewActivity.html">GLSurfaceViewActivity.java</a>
<dt>Layout:
<dd><a href="/guide/samples/ApiDemos/res/layout/hello_world.html">hello_world.xml</a>
<dd><a href="../../../../../../res/layout/hello_world.html">hello_world.xml</a>
</dl>
</dd>
@@ -33,10 +33,9 @@
<dd>Shows how you can place overlays on top of a SurfaceView.
<dl>
<dt>Code:
<dd> <a href="SurfaceViewOverlay.html">SurfaceViewOverlay.java</a>,
<a href="GLSurfaceView.html">GLSurfaceView.java</a>
<dd> <a href="SurfaceViewOverlay.html">SurfaceViewOverlay.java</a>
<dt>Layout:
<dd><a href="/guide/samples/ApiDemos/res/layout/surface_view_overlay.html">surface_view_overlay.xml</a>
<dd><a href="../../../../../../res/layout/surface_view_overlay.html">surface_view_overlay.xml</a>
</dl>
</dd>