Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am acbd9fda: am 48515f49: Merge change I0de7979b into eclair

Browse Source 
Merge commit 'acbd9fdaf02ff14c873ce23cfa95afc71af69ae4' into eclair-mr2-plus-aosp

* commit 'acbd9fdaf02ff14c873ce23cfa95afc71af69ae4':
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
This commit is contained in:
Dianne Hackborn
2009-11-11 15:51:57 -08:00
committed by Android Git Automerger
parent 99cf71b085 acbd9fdaf0
commit 6c82b7fe24
3 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/service/wallpaper/IWallpaperEngine.aidl
View File

@@ -16,11 +16,14 @@
package android.service.wallpaper;
import android.view.MotionEvent;
/**
* @hide
*/
oneway interface IWallpaperEngine {
void setDesiredSize(int width, int height);
void setVisibility(boolean visible);
void dispatchPointer(in MotionEvent event);
void destroy();
}

7
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -746,6 +746,12 @@ public abstract class WallpaperService extends Service {
mCaller.sendMessage(msg);
}
public void dispatchPointer(MotionEvent event) {
if (mEngine != null) {
mEngine.mWindow.onDispatchPointer(event, event.getEventTime(), false);
}
}
public void destroy() {
Message msg = mCaller.obtainMessage(DO_DETACH);
mCaller.sendMessage(msg);
@@ -805,6 +811,7 @@ public abstract class WallpaperService extends Service {
mEngine.mPendingMove = null;
}
}
if (DEBUG) Log.v(TAG, "Delivering touch event: " + ev);
mEngine.onTouchEvent(ev);
ev.recycle();
} break;

65
services/java/com/android/server/WindowManagerService.java
View File

@@ -435,6 +435,7 @@ public class WindowManagerService extends IWindowManager.Stub
float mLastWallpaperY = -1;
float mLastWallpaperXStep = -1;
float mLastWallpaperYStep = -1;
boolean mSendingPointersToWallpaper = false;
// This is set when we are waiting for a wallpaper to tell us it is done
// changing its scroll position.
WindowState mWaitingOnWallpaper;
@@ -1749,8 +1750,20 @@ public class WindowManagerService extends IWindowManager.Stub
}
try {
MotionEvent ev = MotionEvent.obtainNoHistory(pointer);
ev.offsetLocation(srcWin.mFrame.left-wallpaper.mFrame.left,
srcWin.mFrame.top-wallpaper.mFrame.top);
if (srcWin != null) {
ev.offsetLocation(srcWin.mFrame.left-wallpaper.mFrame.left,
srcWin.mFrame.top-wallpaper.mFrame.top);
} else {
ev.offsetLocation(-wallpaper.mFrame.left, -wallpaper.mFrame.top);
}
switch (pointer.getAction()) {
case MotionEvent.ACTION_DOWN:
mSendingPointersToWallpaper = true;
break;
case MotionEvent.ACTION_UP:
mSendingPointersToWallpaper = false;
break;
}
wallpaper.mClient.dispatchPointer(ev, eventTime, false);
} catch (RemoteException e) {
Log.w(TAG, "Failure sending pointer to wallpaper", e);
@@ -4836,6 +4849,12 @@ public class WindowManagerService extends IWindowManager.Stub
if (action != MotionEvent.ACTION_MOVE) {
Log.w(TAG, "No window to dispatch pointer action " + ev.getAction());
}
synchronized (mWindowMap) {
if (mSendingPointersToWallpaper) {
Log.i(TAG, "Sending skipped pointer to wallpaper!");
sendPointerToWallpaperLocked(null, ev, ev.getEventTime());
}
}
if (qev != null) {
mQueue.recycleEvent(qev);
}
@@ -4843,6 +4862,12 @@ public class WindowManagerService extends IWindowManager.Stub
return INJECT_FAILED;
}
if (targetObj == mKeyWaiter.CONSUMED_EVENT_TOKEN) {
synchronized (mWindowMap) {
if (mSendingPointersToWallpaper) {
Log.i(TAG, "Sending skipped pointer to wallpaper!");
sendPointerToWallpaperLocked(null, ev, ev.getEventTime());
}
}
if (qev != null) {
mQueue.recycleEvent(qev);
}
@@ -4963,6 +4988,19 @@ public class WindowManagerService extends IWindowManager.Stub
}
synchronized(mWindowMap) {
if (!target.isVisibleLw()) {
// During this motion dispatch, the target window has become
// invisible.
if (mSendingPointersToWallpaper) {
sendPointerToWallpaperLocked(null, ev, eventTime);
}
if (qev != null) {
mQueue.recycleEvent(qev);
}
ev.recycle();
return INJECT_SUCCEEDED;
}
if (qev != null && action == MotionEvent.ACTION_MOVE) {
mKeyWaiter.bindTargetWindowLocked(target,
KeyWaiter.RETURN_PENDING_POINTER, qev);
@@ -4987,15 +5025,16 @@ public class WindowManagerService extends IWindowManager.Stub
mKeyWaiter.mOutsideTouchTargets = null;
}
}
final Rect frame = target.mFrame;
ev.offsetLocation(-(float)frame.left, -(float)frame.top);
mKeyWaiter.bindTargetWindowLocked(target);
// If we are on top of the wallpaper, then the wallpaper also
// gets to see this movement.
if (mWallpaperTarget == target) {
sendPointerToWallpaperLocked(target, ev, eventTime);
if (mWallpaperTarget == target || mSendingPointersToWallpaper) {
sendPointerToWallpaperLocked(null, ev, eventTime);
}
final Rect frame = target.mFrame;
ev.offsetLocation(-(float)frame.left, -(float)frame.top);
mKeyWaiter.bindTargetWindowLocked(target);
}
}
@@ -5918,12 +5957,12 @@ public class WindowManagerService extends IWindowManager.Stub
res.offsetLocation(-win.mFrame.left, -win.mFrame.top);
}
}
}
if (res != null && returnWhat == RETURN_PENDING_POINTER) {
synchronized (mWindowMap) {
if (mWallpaperTarget == win) {
sendPointerToWallpaperLocked(win, res, res.getEventTime());
if (res != null && returnWhat == RETURN_PENDING_POINTER) {
synchronized (mWindowMap) {
if (mWallpaperTarget == win || mSendingPointersToWallpaper) {
sendPointerToWallpaperLocked(win, res, res.getEventTime());
}
}
}
}