am 705a3ee: AI 147793: cleanup broken links and delete all innacurate in
Merge commit '705a3ee3975877460c124d98eda12ae16dadd1a6' into donut
* commit '705a3ee3975877460c124d98eda12ae16dadd1a6':
AI 147793: cleanup broken links and delete all innacurate info in apidemo pages
diff --git a/samples/ApiDemos/src/com/example/android/apis/animation/_index.html b/samples/ApiDemos/src/com/example/android/apis/animation/_index.html
index cd2ea53..8b13789 100644
--- a/samples/ApiDemos/src/com/example/android/apis/animation/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/animation/_index.html
@@ -1,48 +1 @@
-<h3>Drawable</h3>
-<dl>
- <dt><a href="ShapeDrawable1.html">ShapeDrawable</a></dt>
- <dd>Demonstrates creating Drawables in XML.</dd>
-</dl>
-
-<h3>OpenGL|ES</h3>
-<dl>
- <dt><a href="CameraPreview.html">CameraPreview</a></dt>
- <dd> Demonstrates capturing the image stream from the camera, drawing to a surface (extending SurfaceView) on a separate thread (extending Thread).</dd>
-
- <dt><a href="GLSurfaceViewActivity.html">GL SurfaceView</a></dt>
- <dd>Demonstrates how to perform OpenGL rendering in to a SurfaceView.
- <dl>
- <dt>Code:
- <dd> <a href="GLSurfaceViewActivity.html">GLSurfaceViewActivity.java</a>,
- <a href="GLSurfaceView.html">GLSurfaceView.java</a>
- <dt>Layout:
- <dd> <a href="{@docRoot}samples/ApiDemos/res/layout/hello_world.html">
- hello_world.xml</a>
- </dl>
- </dd>
-
- <dt><a href="PolyToPoly.html">PolyToPoly</a></dt>
- <dd>Demonstrates calling the <a href="@{docRoot}reference/android/graphics/Matrix.html#setPolyToPoly(float[],%20int,%20float[],%20int,%20int)">Matrix.setPolyToPoly()</a> method to translate coordinates on a canvas to a new perspective (used to simulate perspective). </dd>
-
- <dt><a href="DrawPoints.html">DrawPoints</a></dt>
- <dd>Demonstrates using the <a href="android.graphics.Paint">Paint</a> and <a href="android.graphics.Canvas">Canvas</a> objects to draw random points on the screen, with different colors and strokes. </dd>
-
- <dt><a href="PathEffects.html">PathEffects</a></dt>
- <dd> Demonstrates the use of <a href="android.graphics.Path">Path</a> and various <a href="android.graphics.PathEffect">PathEffect</a> subclasses. </dd>
-
- <dt><a href="SurfaceViewOverlay.html">SurfaceView Overlay</a></dt>
- <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>
- <dt>Layout:
- <dd> <a href="{@docRoot}samples/ApiDemos/res/layout/surface_view_overlay.html">
- surface_view_overlay.xml</a>
- </dl>
- </dd>
-
- <dt><a href="TouchPaint.html">TouchPaint</a></dt>
- <dd> Demonstrates the handling of touch screen events to implement a simple painting app. </dd>
-</dl>
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/_index.html b/samples/ApiDemos/src/com/example/android/apis/app/_index.html
index 8a768bb..0ea053c 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/app/_index.html
@@ -7,7 +7,7 @@
<dt>Code:
<dd> <a href="HelloWorld.html">HelloWorld.java</a>
<dt>Layout:
- <dd> <a href="{@docRoot}samples/ApiDemos/res/layout/hello_world.html">
+ <dd> <a href="/guide/samples/ApiDemos/res/layout/hello_world.html">
hello_world.xml</a>
</dl>
</dd>
@@ -34,7 +34,7 @@
<dt><a href="TranslucentActivity.html">Translucent</a></dt>
<dd>Demonstrates how to make an activity with a transparent background. </dd>
- <dt><a href="TranslucentFancyActivity.html">TranslucentFancy</a></dt>
+ <dt><a href="TranslucentBlurActivity.html">TranslucentBlur</a></dt>
<dd>Demonstrates how to make an activity with a transparent background with
a special effect (blur). </dd>
</dl>
@@ -82,7 +82,7 @@
<dd> <a href="ServiceStartArgumentsController.html">ServiceStartArgumentsController.java</a>
<dd> <a href="ServiceStartArguments.html">ServiceStartArguments.java</a>
<dt>Layout:
- <dd> <a href="{@docRoot}samples/ApiDemos/res/layout/service_start_arguments_controller.html">
+ <dd> <a href="/guide/samples/ApiDemos/res/layout/service_start_arguments_controller.html">
service_start_arguments_controller.xml</a>
</dl>
</dd>
@@ -101,7 +101,7 @@
<dd> <a href="OneShotAlarm.html">OneShotAlarm.java</a>
<dd> <a href="RepeatingAlarm.html">RepeatingAlarm.java</a>
<dt>Layout:
- <dd> <a href="{@docRoot}samples/ApiDemos/res/layout/alarm_controller.html">
+ <dd> <a href="/guide/samples/ApiDemos/res/layout/alarm_controller.html">
alarm_controller.xml</a>
</dl>
</dd>
@@ -115,7 +115,7 @@
<dd> <a href="AlarmService.html">AlarmService.java</a>
<dd> <a href="AlarmService_Service.html">AlarmService_Service.java</a>
<dt>Layout:
- <dd> <a href="{@docRoot}samples/ApiDemos/res/layout/alarm_service.html">
+ <dd> <a href="/guide/samples/ApiDemos/res/layout/alarm_service.html">
alarm_service.xml</a>
</dl>
</dd>
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/_index.html b/samples/ApiDemos/src/com/example/android/apis/graphics/_index.html
index cd2ea53..1f2b1b0 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/_index.html
@@ -8,28 +8,26 @@
<h3>OpenGL|ES</h3>
<dl>
<dt><a href="CameraPreview.html">CameraPreview</a></dt>
- <dd> Demonstrates capturing the image stream from the camera, drawing to a surface (extending SurfaceView) on a separate thread (extending Thread).</dd>
+ <dd>Demonstrates capturing the image stream from the camera, drawing to a surface (extending SurfaceView) on a separate thread (extending Thread).</dd>
<dt><a href="GLSurfaceViewActivity.html">GL SurfaceView</a></dt>
<dd>Demonstrates how to perform OpenGL rendering in to a SurfaceView.
<dl>
<dt>Code:
- <dd> <a href="GLSurfaceViewActivity.html">GLSurfaceViewActivity.java</a>,
- <a href="GLSurfaceView.html">GLSurfaceView.java</a>
+ <dd><a href="GLSurfaceViewActivity.html">GLSurfaceViewActivity.java</a>
<dt>Layout:
- <dd> <a href="{@docRoot}samples/ApiDemos/res/layout/hello_world.html">
- hello_world.xml</a>
+ <dd><a href="/guide/samples/ApiDemos/res/layout/hello_world.html">hello_world.xml</a>
</dl>
</dd>
<dt><a href="PolyToPoly.html">PolyToPoly</a></dt>
- <dd>Demonstrates calling the <a href="@{docRoot}reference/android/graphics/Matrix.html#setPolyToPoly(float[],%20int,%20float[],%20int,%20int)">Matrix.setPolyToPoly()</a> method to translate coordinates on a canvas to a new perspective (used to simulate perspective). </dd>
+ <dd>Demonstrates calling the {@link android.graphics.Matrix.html#setPolyToPoly(float[],int,float[],int,int)} method to translate coordinates on a canvas to a new perspective (used to simulate perspective). </dd>
<dt><a href="DrawPoints.html">DrawPoints</a></dt>
- <dd>Demonstrates using the <a href="android.graphics.Paint">Paint</a> and <a href="android.graphics.Canvas">Canvas</a> objects to draw random points on the screen, with different colors and strokes. </dd>
+ <dd>Demonstrates using the {@link android.graphics.Paint} and {@link android.graphics.Canvas} objects to draw random points on the screen, with different colors and strokes. </dd>
<dt><a href="PathEffects.html">PathEffects</a></dt>
- <dd> Demonstrates the use of <a href="android.graphics.Path">Path</a> and various <a href="android.graphics.PathEffect">PathEffect</a> subclasses. </dd>
+ <dd>Demonstrates the use of {@link android.graphics.Path} and various {@link android.graphics.PathEffect} subclasses. </dd>
<dt><a href="SurfaceViewOverlay.html">SurfaceView Overlay</a></dt>
<dd>Shows how you can place overlays on top of a SurfaceView.
@@ -38,11 +36,10 @@
<dd> <a href="SurfaceViewOverlay.html">SurfaceViewOverlay.java</a>,
<a href="GLSurfaceView.html">GLSurfaceView.java</a>
<dt>Layout:
- <dd> <a href="{@docRoot}samples/ApiDemos/res/layout/surface_view_overlay.html">
- surface_view_overlay.xml</a>
+ <dd><a href="/guide/samples/ApiDemos/res/layout/surface_view_overlay.html">surface_view_overlay.xml</a>
</dl>
</dd>
<dt><a href="TouchPaint.html">TouchPaint</a></dt>
- <dd> Demonstrates the handling of touch screen events to implement a simple painting app. </dd>
+ <dd>Demonstrates the handling of touch screen events to implement a simple painting app. </dd>
</dl>
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/_index.html b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
index 9497f8e..1561729 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
@@ -100,9 +100,6 @@
<dt><a href="Baseline4.html">4. Everywhere</a></dt>
<dd>Demonstrates the default baseline alignment in a complex LinearLayout.</dd>
-
- <dt><a href="Baseline5.html">5. Everywhere</a></dt>
- <dd>Demonstrates turning off baseline alignment in a LinearLayout. </dd>
<dt><a href="Baseline6.html">6. Multi-line</a></dt>
<dd>Demonstrates a baseline alignment with a multiline field. </dd>
@@ -215,12 +212,6 @@
<dd> Demonstrates populating a GridView widget with images using a custom ListAdapter object. </dd>
</dl>
-<h3>Ticker</h3>
-<dl>
- <dt><a href="Ticker1.html">Ticker</a></dt>
- <dd> Demonstrates a Ticker widget, which scrolls text across the screen.</dd>
-</dl>
-
<h3>ImageSwitcher</h3>
<dl>
<dt><a href="ImageSwitcher1.html">ImageSwitcher</a></dt>