diff options
| author | Scott Main <smain@google.com> | 2013-02-06 12:26:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-06 12:26:46 -0800 |
| commit | 11f1c5b89a98cb6794f2b1f158b8c22e38af975f (patch) | |
| tree | 99a59eff2c550f3b01839a918931ad5479b10b49 /graphics | |
| parent | 90976c8493ab9439eb8ddaad30aaa0d171467f43 (diff) | |
| parent | b3a57191e62e0c394ba4a3448770853a1fb7ac3b (diff) | |
| download | frameworks_base-11f1c5b89a98cb6794f2b1f158b8c22e38af975f.zip frameworks_base-11f1c5b89a98cb6794f2b1f158b8c22e38af975f.tar.gz frameworks_base-11f1c5b89a98cb6794f2b1f158b8c22e38af975f.tar.bz2 | |
am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit 'b3a57191e62e0c394ba4a3448770853a1fb7ac3b':
docs: fix renderscript links that currently require redirect
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 |