diff options
author | Dianne Hackborn <hackbod@google.com> | 2009-11-10 18:15:35 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-10 18:15:35 -0800 |
commit | 6d65bec3ff32852a150011431344a1420f225d18 (patch) | |
tree | 56204f636f50e17ea9ea6b1b5751edf28cf1ea97 | |
parent | f75fb86c94a0bdde4cb7df38356e037b244ebb78 (diff) | |
parent | 510c489a081dae49f86033ecbf1b6e866c69656c (diff) | |
download | android_packages_wallpapers_LivePicker-6d65bec3ff32852a150011431344a1420f225d18.tar.gz android_packages_wallpapers_LivePicker-6d65bec3ff32852a150011431344a1420f225d18.tar.bz2 android_packages_wallpapers_LivePicker-6d65bec3ff32852a150011431344a1420f225d18.zip |
am 510c489a: am d4e57d4c: Related work on issue #2170897.
Merge commit '510c489a081dae49f86033ecbf1b6e866c69656c'
* commit '510c489a081dae49f86033ecbf1b6e866c69656c':
Related work on issue #2170897.
-rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java index cbc783d..f63d5a0 100644 --- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java @@ -32,6 +32,7 @@ import android.os.RemoteException; import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.Bundle; +import android.view.MotionEvent; import android.view.View; import android.view.WindowManager; import android.view.ViewGroup; @@ -182,6 +183,25 @@ public class LiveWallpaperPreview extends Activity { mWallpaperConnection = null; } + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + if (mWallpaperConnection != null && mWallpaperConnection.mEngine != null) { + MotionEvent dup = MotionEvent.obtainNoHistory(ev); + try { + mWallpaperConnection.mEngine.dispatchPointer(dup); + } catch (RemoteException e) { + } + } + + if (ev.getAction() == MotionEvent.ACTION_DOWN) { + onUserInteraction(); + } + if (getWindow().superDispatchTouchEvent(ev)) { + return true; + } + return onTouchEvent(ev); + } + class WallpaperConnection extends IWallpaperConnection.Stub implements ServiceConnection { final Intent mIntent; IWallpaperService mService; |