diff options
author | Scott Main <smain@google.com> | 2013-02-06 20:14:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-06 20:14:49 +0000 |
commit | 00f490844d89b146e5490204a5a483834950c489 (patch) | |
tree | d79cfd3359de6663bfd9f07ceaabfb37477cda93 /graphics | |
parent | d6e0c147175708bcc02813fc0f4008179e95b9e7 (diff) | |
parent | b47fa1699a02a96d5da8e175966e9584c6bd5565 (diff) | |
download | frameworks_base-00f490844d89b146e5490204a5a483834950c489.zip frameworks_base-00f490844d89b146e5490204a5a483834950c489.tar.gz frameworks_base-00f490844d89b146e5490204a5a483834950c489.tar.bz2 |
Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
Diffstat (limited to 'graphics')
7 files changed, 7 insertions, 7 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index 10ccb87..e6a5583 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -67,7 +67,7 @@ import android.util.TypedValue; * <div class="special reference"> * <h3>Developer Guides</h3> * <p>For more information about creating an application that uses Renderscript, read the - * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * <a href="{@docRoot}guide/topics/renderscript/index.html">Renderscript</a> developer guide.</p> * </div> **/ public class Allocation extends BaseObj { diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java index 060f526..93cabd6 100644 --- a/graphics/java/android/renderscript/Element.java +++ b/graphics/java/android/renderscript/Element.java @@ -44,7 +44,7 @@ import android.util.Log; * <div class="special reference"> * <h3>Developer Guides</h3> * <p>For more information about creating an application that uses Renderscript, read the - * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * <a href="{@docRoot}guide/topics/renderscript/index.html">Renderscript</a> developer guide.</p> * </div> **/ public class Element extends BaseObj { diff --git a/graphics/java/android/renderscript/RSSurfaceView.java b/graphics/java/android/renderscript/RSSurfaceView.java index 506f1af..82ed95c 100644 --- a/graphics/java/android/renderscript/RSSurfaceView.java +++ b/graphics/java/android/renderscript/RSSurfaceView.java @@ -36,7 +36,7 @@ import android.view.SurfaceView; * <div class="special reference"> * <h3>Developer Guides</h3> * <p>For more information about creating an application that uses Renderscript, read the - * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * <a href="{@docRoot}guide/topics/renderscript/index.html">Renderscript</a> developer guide.</p> * </div> */ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback { diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 76edb0a..66960bc 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -41,7 +41,7 @@ import android.view.Surface; * <div class="special reference"> * <h3>Developer Guides</h3> * <p>For more information about creating an application that uses Renderscript, read the - * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * <a href="{@docRoot}guide/topics/renderscript/index.html">Renderscript</a> developer guide.</p> * </div> **/ public class RenderScript { diff --git a/graphics/java/android/renderscript/RenderScriptGL.java b/graphics/java/android/renderscript/RenderScriptGL.java index 12c8102..5269405 100644 --- a/graphics/java/android/renderscript/RenderScriptGL.java +++ b/graphics/java/android/renderscript/RenderScriptGL.java @@ -39,7 +39,7 @@ import android.view.SurfaceView; * <div class="special reference"> * <h3>Developer Guides</h3> * <p>For more information about creating an application that uses Renderscript, read the - * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * <a href="{@docRoot}guide/topics/renderscript/index.html">Renderscript</a> developer guide.</p> * </div> **/ public class RenderScriptGL extends RenderScript { diff --git a/graphics/java/android/renderscript/Type.java b/graphics/java/android/renderscript/Type.java index a707df2..09b6281 100644 --- a/graphics/java/android/renderscript/Type.java +++ b/graphics/java/android/renderscript/Type.java @@ -38,7 +38,7 @@ import android.util.Log; * <div class="special reference"> * <h3>Developer Guides</h3> * <p>For more information about creating an application that uses Renderscript, read the - * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * <a href="{@docRoot}guide/topics/renderscript/index.html">Renderscript</a> developer guide.</p> * </div> **/ public class Type extends BaseObj { diff --git a/graphics/java/android/renderscript/package.html b/graphics/java/android/renderscript/package.html index 775645f..5eab23c 100644 --- a/graphics/java/android/renderscript/package.html +++ b/graphics/java/android/renderscript/package.html @@ -4,7 +4,7 @@ carrying out mathematical calculations and 3D graphics rendering.</p> <p>For more information, see the -<a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> +<a href="{@docRoot}guide/topics/renderscript/index.html">Renderscript</a> developer guide.</p> {@more} <p>An example of Renderscript in applications include the 3D carousel view that is present in |