am 2c97ad64: am 0bf9cdf5: am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."

Merge commit '2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d'

* commit '2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d':
  Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
This commit is contained in:
Android Git Automerger
2009-11-13 11:58:41 -08:00

View File

@@ -72,9 +72,6 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
@Override @Override
public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) { public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
super.onSurfaceChanged(holder, format, width, height); super.onSurfaceChanged(holder, format, width, height);
if (mRs != null) {
mRs.contextSetSurface(width, height, holder.getSurface());
}
if (mRenderer == null) { if (mRenderer == null) {
mRenderer = createScene(width, height); mRenderer = createScene(width, height);
mRenderer.init(mRs, getResources(), isPreview()); mRenderer.init(mRs, getResources(), isPreview());
@@ -98,7 +95,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
while (surface == null) { while (surface == null) {
surface = holder.getSurface(); surface = holder.getSurface();
} }
mRs = new RenderScript(false, false); mRs = new RenderScript(surface, false, false);
} }
@Override @Override