diff options
| author | Marco Nelissen <marcone@google.com> | 2010-09-23 11:06:09 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2010-09-23 11:06:09 -0700 |
| commit | ea5f69c0322999731e567b60287fb581ebb16aa3 (patch) | |
| tree | 433bf7ccb846078240eed84ab66f7446b47c194b /src/com | |
| parent | 864c3d7eb95fe1605d9c39d8f651a2831e535f47 (diff) | |
| parent | 896a34b4dbb770fc55f3ff71ab80fa9813c64a2d (diff) | |
| download | android_packages_wallpapers_MagicSmoke-ea5f69c0322999731e567b60287fb581ebb16aa3.tar.gz android_packages_wallpapers_MagicSmoke-ea5f69c0322999731e567b60287fb581ebb16aa3.tar.bz2 android_packages_wallpapers_MagicSmoke-ea5f69c0322999731e567b60287fb581ebb16aa3.zip | |
resolved conflicts for merge of 896a34b4 to master
Change-Id: Idb94e8674611f9ed960f1c4e8340ea6489b27d6b
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/magicsmoke/RenderScriptWallpaper.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/magicsmoke/RenderScriptWallpaper.java b/src/com/android/magicsmoke/RenderScriptWallpaper.java index 75abf0d..4779fba 100644 --- a/src/com/android/magicsmoke/RenderScriptWallpaper.java +++ b/src/com/android/magicsmoke/RenderScriptWallpaper.java @@ -19,6 +19,7 @@ package com.android.magicsmoke; import android.service.wallpaper.WallpaperService; import android.os.Bundle; +import android.graphics.PixelFormat; import android.renderscript.RenderScriptGL; import android.renderscript.RenderScript; import android.util.Log; @@ -42,6 +43,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends super.onCreate(surfaceHolder); setTouchEventsEnabled(false); surfaceHolder.setSizeFromLayout(); + surfaceHolder.setFormat(PixelFormat.RGBX_8888); } @Override |