Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3a57191 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links... 

am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev

# Via Android Git Automerger (2) and others
* commit '0a00de11':
  docs: fix renderscript links that currently require redirect
parents a7e028a9 0a00de11

docs/html/about/versions/android-3.0.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -571,7 +571,7 @@ as a special, platform-independent shader language for maximum performance. Usin 
can accelerate graphics operations and data processing. Renderscript is an ideal way to create

can accelerate graphics operations and data processing. Renderscript is an ideal way to create

high-performance 3D effects for applications, wallpapers, carousels, and more.</p>

high-performance 3D effects for applications, wallpapers, carousels, and more.</p>

<p>For more information, see the <a

<p>For more information, see the <a

href="{@docRoot}guide/topics/graphics/renderscript.html">3D Rendering and Computation with

href="{@docRoot}guide/topics/renderscript/index.html">3D Rendering and Computation with

Renderscript</a> documentation.</p></li>

Renderscript</a> documentation.</p></li>

</ul>

</ul>

docs/html/sitemap.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2611,7 +2611,7 @@ http://developer.android.com/reference/android/inputmethodservice/Keyboard.html 
http://developer.android.com/reference/android/support/v4/view/PagerTabStrip.html

http://developer.android.com/reference/android/support/v4/view/PagerTabStrip.html

http://developer.android.com/reference/android/support/v4/view/PagerTitleStrip.html

http://developer.android.com/reference/android/support/v4/view/PagerTitleStrip.html

http://developer.android.com/reference/android/renderscript/RSSurfaceView.html

http://developer.android.com/reference/android/renderscript/RSSurfaceView.html

http://developer.android.com/guide/topics/graphics/renderscript.html

http://developer.android.com/guide/topics/renderscript/index.html

http://developer.android.com/reference/android/renderscript/RSTextureView.html

http://developer.android.com/reference/android/renderscript/RSTextureView.html

http://developer.android.com/reference/android/appwidget/AppWidgetHost.html

http://developer.android.com/reference/android/appwidget/AppWidgetHost.html

http://developer.android.com/reference/javax/xml/XMLConstants.html

http://developer.android.com/reference/javax/xml/XMLConstants.html

graphics/java/android/renderscript/Allocation.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ import android.util.TypedValue; 
 * <div class="special reference">

 * <div class="special reference">

 * <h3>Developer Guides</h3>

 * <h3>Developer Guides</h3>

 * <p>For more information about creating an application that uses Renderscript, read the

 * <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>

 * </div>

 **/

 **/

public class Allocation extends BaseObj {

public class Allocation extends BaseObj {

graphics/java/android/renderscript/Element.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ import android.util.Log; 
 * <div class="special reference">

 * <div class="special reference">

 * <h3>Developer Guides</h3>

 * <h3>Developer Guides</h3>

 * <p>For more information about creating an application that uses Renderscript, read the

 * <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>

 * </div>

 **/

 **/

public class Element extends BaseObj {

public class Element extends BaseObj {

graphics/java/android/renderscript/RSSurfaceView.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ import android.view.SurfaceView; 
 * <div class="special reference">

 * <div class="special reference">

 * <h3>Developer Guides</h3>

 * <h3>Developer Guides</h3>

 * <p>For more information about creating an application that uses Renderscript, read the

 * <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>

 * </div>

 */

 */

public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback {

public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback {