summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2010-09-15 14:24:45 -0700
committerMarco Nelissen <marcone@google.com>2010-09-15 14:24:45 -0700
commit81aa2696e202b0586b8d1c707a5fd74da8709f18 (patch)
tree89e0e059a75250a3ed6d9ba7ce9619154faaff58
parent0fc62f8eb8e020b742a43c7e8a44ed78b9d7da4a (diff)
downloadandroid_packages_wallpapers_MagicSmoke-81aa2696e202b0586b8d1c707a5fd74da8709f18.tar.gz
android_packages_wallpapers_MagicSmoke-81aa2696e202b0586b8d1c707a5fd74da8709f18.tar.bz2
android_packages_wallpapers_MagicSmoke-81aa2696e202b0586b8d1c707a5fd74da8709f18.zip
Apparently we can now get motionevents before the renderer is created.
Change-Id: I6f4e5be8c8c4b3b8a47847f74309c3e9ded81b10
-rw-r--r--src/com/android/magicsmoke/RenderScriptWallpaper.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/magicsmoke/RenderScriptWallpaper.java b/src/com/android/magicsmoke/RenderScriptWallpaper.java
index 1f24812..914dc28 100644
--- a/src/com/android/magicsmoke/RenderScriptWallpaper.java
+++ b/src/com/android/magicsmoke/RenderScriptWallpaper.java
@@ -89,13 +89,17 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
@Override
public void onTouchEvent(MotionEvent event) {
- mRenderer.onTouchEvent(event);
+ if (mRenderer != null) {
+ mRenderer.onTouchEvent(event);
+ }
}
@Override
public void onOffsetsChanged(float xOffset, float yOffset,
float xStep, float yStep, int xPixels, int yPixels) {
- mRenderer.setOffset(xOffset, yOffset, xStep, yStep, xPixels, yPixels);
+ if (mRenderer != null) {
+ mRenderer.setOffset(xOffset, yOffset, xStep, yStep, xPixels, yPixels);
+ }
}
@Override