diff options
author | Jason Sams <rjsams@android.com> | 2010-12-06 16:05:31 -0800 |
---|---|---|
committer | Jason Sams <rjsams@android.com> | 2010-12-06 16:05:31 -0800 |
commit | 213cc60e83d3d34e09b5907d8ded0a15892993f1 (patch) | |
tree | 1e05f53720145ceabef52f7461ab590c937bb95e /src | |
parent | 26122dc2e3971577fd8bbcfbac2140d73b817377 (diff) | |
download | android_packages_wallpapers_HoloSpiral-213cc60e83d3d34e09b5907d8ded0a15892993f1.tar.gz android_packages_wallpapers_HoloSpiral-213cc60e83d3d34e09b5907d8ded0a15892993f1.tar.bz2 android_packages_wallpapers_HoloSpiral-213cc60e83d3d34e09b5907d8ded0a15892993f1.zip |
API update
Change-Id: I803a4b044849bb5e5cfc590543e5213e9c862867
Diffstat (limited to 'src')
3 files changed, 14 insertions, 19 deletions
diff --git a/src/com/android/wallpaper/holospiral/HoloSpiralRS.java b/src/com/android/wallpaper/holospiral/HoloSpiralRS.java index 73677ff..f2b846c 100644 --- a/src/com/android/wallpaper/holospiral/HoloSpiralRS.java +++ b/src/com/android/wallpaper/holospiral/HoloSpiralRS.java @@ -84,11 +84,11 @@ public class HoloSpiralRS { } public void start() { - mRS.contextBindRootScript(mScript); + mRS.bindRootScript(mScript); } public void stop() { - mRS.contextBindRootScript(null); + mRS.bindRootScript(null); } public void resize(int width, int height) { @@ -96,7 +96,7 @@ public class HoloSpiralRS { } private void createScript() { - mScript = new ScriptC_holo_spiral(mRS, mResources, R.raw.holo_spiral, true); + mScript = new ScriptC_holo_spiral(mRS, mResources, R.raw.holo_spiral); mScript.set_gNearPlane(NEAR_PLANE); mScript.set_gFarPlane(FAR_PLANE); diff --git a/src/com/android/wallpaper/holospiral/HoloSpiralView.java b/src/com/android/wallpaper/holospiral/HoloSpiralView.java index 2a8e305..5cdc3e7 100644 --- a/src/com/android/wallpaper/holospiral/HoloSpiralView.java +++ b/src/com/android/wallpaper/holospiral/HoloSpiralView.java @@ -46,9 +46,9 @@ public class HoloSpiralView extends RSSurfaceView { } if (mRenderScript != null) { - mRenderScript.contextSetSurface(0, 0, null); + mRenderScript.setSurface(null, 0, 0); mRenderScript = null; - destroyRenderScript(); + destroyRenderScriptGL(); } } @@ -61,8 +61,8 @@ public class HoloSpiralView extends RSSurfaceView { surface = surfaceHolder.getSurface(); } RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig(); - mRenderScript = createRenderScript(sc); - mRenderScript.contextSetPriority(RenderScript.Priority.LOW); + mRenderScript = createRenderScriptGL(sc); + mRenderScript.setPriority(RenderScript.Priority.LOW); surfaceHolder.setSizeFromLayout(); surfaceHolder.setFormat(PixelFormat.RGBA_8888); @@ -78,7 +78,7 @@ public class HoloSpiralView extends RSSurfaceView { public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int width, int height) { super.surfaceChanged(surfaceHolder, format, width, height); if (mRenderScript != null) { - mRenderScript.contextSetSurface(width, height, surfaceHolder.getSurface()); + mRenderScript.setSurface(surfaceHolder, width, height); } if (mWallpaperRS == null) { @@ -90,17 +90,15 @@ public class HoloSpiralView extends RSSurfaceView { mWallpaperWidth = width; } - @Override public void onResume() { - super.onResume(); + resume(); if (mWallpaperRS != null) { mWallpaperRS.start(); } } - @Override public void onPause() { - super.onPause(); + pause(); if (mWallpaperRS != null) { mWallpaperRS.stop(); } diff --git a/src/com/android/wallpaper/holospiral/HoloSpiralWallpaper.java b/src/com/android/wallpaper/holospiral/HoloSpiralWallpaper.java index 90e4630..293aad6 100644 --- a/src/com/android/wallpaper/holospiral/HoloSpiralWallpaper.java +++ b/src/com/android/wallpaper/holospiral/HoloSpiralWallpaper.java @@ -58,7 +58,7 @@ public class HoloSpiralWallpaper extends WallpaperService { } if (mRenderScript != null) { - mRenderScript.contextSetSurface(0, 0, null); + mRenderScript.setSurface(null, 0, 0); mRenderScript.destroy(); mRenderScript = null; } @@ -67,13 +67,10 @@ public class HoloSpiralWallpaper extends WallpaperService { @Override public void onSurfaceCreated(SurfaceHolder surfaceHolder) { super.onSurfaceCreated(surfaceHolder); - Surface surface = null; - while (surface == null) { - surface = surfaceHolder.getSurface(); - } + RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig(); mRenderScript = new RenderScriptGL(sc); - mRenderScript.contextSetPriority(RenderScript.Priority.LOW); + mRenderScript.setPriority(RenderScript.Priority.LOW); } @Override @@ -88,7 +85,7 @@ public class HoloSpiralWallpaper extends WallpaperService { super.onSurfaceChanged(surfaceHolder, format, width, height); if (mRenderScript != null) { - mRenderScript.contextSetSurface(width, height, surfaceHolder.getSurface()); + mRenderScript.setSurface(surfaceHolder, width, height); } if (mWallpaperRS == null) { |