drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

Browse Source 
Added a new PointerIcon API (hidden for now) for loading
pointer icons.

Fixed a starvation problem in the native Looper's sendMessage
implementation which caused new messages to be posted ahead
of old messages sent with sendMessageDelayed.

Redesigned the touch pad gestures to be defined in terms of
more fluid finger / spot movements.  The objective is to reinforce
the natural mapping between fingers and spots which means there
must not be any discontinuities in spot motion relative to
the fingers.

Removed the SpotController stub and folded its responsibilities
into PointerController.

Change-Id: Ib647dbd7a57a7f30dd9c6e2c260df51d7bbdd18e
This commit is contained in:
Jeff Brown
2011-04-12 22:39:53 -07:00
committed by Jeff Brown
parent a6dbfdd3a8
commit 86ea1f5f52
29 changed files with 2003 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
services/java/com/android/server/wm/InputManager.java
View File

@ -23,12 +23,6 @@ import org.xmlpull.v1.XmlPullParser;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.XmlResourceParser;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Environment;
import android.os.Looper;
import android.os.MessageQueue;
@ -39,6 +33,7 @@ import android.view.InputChannel;
import android.view.InputDevice;
import android.view.InputEvent;
import android.view.KeyEvent;
import android.view.PointerIcon;
import android.view.Surface;
import android.view.ViewConfiguration;
import android.view.WindowManager;
@ -62,7 +57,8 @@ public class InputManager {
private final Context mContext;
private final WindowManagerService mWindowManagerService;
private static native void nativeInit(Callbacks callbacks, MessageQueue messageQueue);
private static native void nativeInit(Context context,
Callbacks callbacks, MessageQueue messageQueue);
private static native void nativeStart();
private static native void nativeSetDisplaySize(int displayId, int width, int height);
private static native void nativeSetDisplayOrientation(int displayId, int rotation);
@ -125,7 +121,7 @@ public class InputManager {
Looper looper = windowManagerService.mH.getLooper();
Slog.i(TAG, "Initializing input manager");
nativeInit(mCallbacks, looper.getQueue());
nativeInit(mContext, mCallbacks, looper.getQueue());
}
public void start() {
@ -370,48 +366,6 @@ public class InputManager {
}
}
private static final class PointerIcon {
public Bitmap bitmap;
public float hotSpotX;
public float hotSpotY;
public static PointerIcon load(Resources resources, int resourceId) {
PointerIcon icon = new PointerIcon();
XmlResourceParser parser = resources.getXml(resourceId);
final int bitmapRes;
try {
XmlUtils.beginDocument(parser, "pointer-icon");
TypedArray a = resources.obtainAttributes(
parser, com.android.internal.R.styleable.PointerIcon);
bitmapRes = a.getResourceId(com.android.internal.R.styleable.PointerIcon_bitmap, 0);
icon.hotSpotX = a.getFloat(com.android.internal.R.styleable.PointerIcon_hotSpotX, 0);
icon.hotSpotY = a.getFloat(com.android.internal.R.styleable.PointerIcon_hotSpotY, 0);
a.recycle();
} catch (Exception ex) {
Slog.e(TAG, "Exception parsing pointer icon resource.", ex);
return null;
} finally {
parser.close();
}
if (bitmapRes == 0) {
Slog.e(TAG, "<pointer-icon> is missing bitmap attribute");
return null;
}
Drawable drawable = resources.getDrawable(bitmapRes);
if (!(drawable instanceof BitmapDrawable)) {
Slog.e(TAG, "<pointer-icon> bitmap attribute must refer to a bitmap drawable");
return null;
}
icon.bitmap = ((BitmapDrawable)drawable).getBitmap();
return icon;
}
}
/*
* Callbacks from native.
*/
@ -564,8 +518,7 @@ public class InputManager {
@SuppressWarnings("unused")
public PointerIcon getPointerIcon() {
return PointerIcon.load(mContext.getResources(),
com.android.internal.R.drawable.pointer_arrow_icon);
return PointerIcon.getDefaultIcon(mContext);
}
}
}