am 63530ed8: am b13eb3e7: Merge changes I674b9804,If2d2e37b into jb-mr2-dev (607dceda) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -24173,6 +24173,7 @@ package android.view {
		field public static final int SOURCE_CLASS_BUTTON = 1; // 0x1
		field public static final int SOURCE_CLASS_JOYSTICK = 16; // 0x10
		field public static final int SOURCE_CLASS_MASK = 255; // 0xff
		field public static final int SOURCE_CLASS_NONE = 0; // 0x0
		field public static final int SOURCE_CLASS_POINTER = 2; // 0x2
		field public static final int SOURCE_CLASS_POSITION = 8; // 0x8
		field public static final int SOURCE_CLASS_TRACKBALL = 4; // 0x4
		@@ -24184,6 +24185,7 @@ package android.view {
		field public static final int SOURCE_STYLUS = 16386; // 0x4002
		field public static final int SOURCE_TOUCHPAD = 1048584; // 0x100008
		field public static final int SOURCE_TOUCHSCREEN = 4098; // 0x1002
		field public static final int SOURCE_TOUCH_NAVIGATION = 2097152; // 0x200000
		field public static final int SOURCE_TRACKBALL = 65540; // 0x10004
		field public static final int SOURCE_UNKNOWN = 0; // 0x0
		}
		@@ -24196,6 +24198,7 @@ package android.view {
		method public float getMin();
		method public float getRange();
		method public int getSource();
		method public boolean isFromSource(int);
		}

		public abstract class InputEvent implements android.os.Parcelable {
		@@ -24204,6 +24207,7 @@ package android.view {
		method public abstract int getDeviceId();
		method public abstract long getEventTime();
		method public abstract int getSource();
		method public boolean isFromSource(int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

core/java/android/view/InputDevice.java

+32 −1

Original line number	Diff line number	Diff line
		@@ -63,6 +63,13 @@ public final class InputDevice implements Parcelable {
		*/
		public static final int SOURCE_CLASS_MASK = 0x000000ff;

		/**
		* The input source has no class.
		*
		* It is up to the application to determine how to handle the device based on the device type.
		*/
		public static final int SOURCE_CLASS_NONE = 0x00000000;

		/**
		* The input source has buttons or keys.
		* Examples: {@link #SOURCE_KEYBOARD}, {@link #SOURCE_DPAD}.
		@@ -201,6 +208,17 @@ public final class InputDevice implements Parcelable {
		*/
		public static final int SOURCE_TOUCHPAD = 0x00100000 \| SOURCE_CLASS_POSITION;

		/**
		* The input source is a touch device whose motions should be interpreted as navigation events.
		*
		* For example, an upward swipe should be as an upward focus traversal in the same manner as
		* pressing up on a D-Pad would be. Swipes to the left, right and down should be treated in a
		* similar manner.
		*
		* @see #SOURCE_CLASS_NONE
		*/
		public static final int SOURCE_TOUCH_NAVIGATION = 0x00200000 \| SOURCE_CLASS_NONE;

		/**
		* The input source is a joystick.
		* (It may also be a {@link #SOURCE_GAMEPAD}).
		@@ -633,6 +651,19 @@ public final class InputDevice implements Parcelable {
		return mSource;
		}


		/**
		* Determines whether the event is from the given source.
		*
		* @param source The input source to check against. This can be a specific device type,
		* such as {@link InputDevice#SOURCE_TOUCH_NAVIGATION}, or a more generic device class,
		* such as {@link InputDevice#SOURCE_CLASS_POINTER}.
		* @return Whether the event is from the given source.
		*/
		public boolean isFromSource(int source) {
		return (getSource() & source) == source;
		}

		/**
		* Gets the inclusive minimum value for the axis.
		* @return The inclusive minimum value.

core/java/android/view/InputEvent.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,18 @@ public abstract class InputEvent implements Parcelable {
		*/
		public abstract void setSource(int source);

		/**
		* Determines whether the event is from the given source.
		*
		* @param source The input source to check against. This can be a specific device type, such as
		* {@link InputDevice#SOURCE_TOUCH_NAVIGATION}, or a more generic device class, such as
		* {@link InputDevice#SOURCE_CLASS_POINTER}.
		* @return Whether the event is from the given source.
		*/
		public boolean isFromSource(int source) {
		return (getSource() & source) == source;
		}

		/**
		* Copies the event.
		*

core/java/android/view/SimulatedDpad.java

+35 −35

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import android.os.UserHandle;
		import android.util.Log;

		/**
		* This class creates DPAD events from touchpad events.
		* This class creates DPAD events from TouchNavigation events.
		*
		* @see ViewRootImpl
		*/
		@@ -47,18 +47,18 @@ class SimulatedDpad {
		private static final int MSG_FLICK = 313;
		// TODO: Pass touch slop from the input device
		private static final int TOUCH_SLOP = 30;
		// The position of the previous touchpad event
		private float mLastTouchpadXPosition;
		private float mLastTouchpadYPosition;
		// Where the touchpad was initially pressed
		private float mTouchpadEnterXPosition;
		private float mTouchpadEnterYPosition;
		// The position of the previous TouchNavigation event
		private float mLastTouchNavigationXPosition;
		private float mLastTouchNavigationYPosition;
		// Where the Touch Navigation was initially pressed
		private float mTouchNavigationEnterXPosition;
		private float mTouchNavigationEnterYPosition;
		// When the most recent ACTION_HOVER_ENTER occurred
		private long mLastTouchPadStartTimeMs = 0;
		private long mLastTouchNavigationStartTimeMs = 0;
		// When the most recent direction key was sent
		private long mLastTouchPadKeySendTimeMs = 0;
		private long mLastTouchNavigationKeySendTimeMs = 0;
		// When the most recent touch event of any type occurred
		private long mLastTouchPadEventTimeMs = 0;
		private long mLastTouchNavigationEventTimeMs = 0;
		// Did the swipe begin in a valid region
		private boolean mEdgeSwipePossible;

		@@ -140,7 +140,7 @@ class SimulatedDpad {
		}
		};

		public void updateTouchPad(ViewRootImpl viewroot, MotionEvent event,
		public void updateTouchNavigation(ViewRootImpl viewroot, MotionEvent event,
		boolean synthesizeNewKeys) {
		if (!synthesizeNewKeys) {
		mHandler.removeMessages(MSG_FLICK);
		@@ -149,14 +149,14 @@ class SimulatedDpad {
		if (device == null) {
		return;
		}
		// Store what time the touchpad event occurred
		// Store what time the TouchNavigation event occurred
		final long time = SystemClock.uptimeMillis();
		switch (event.getAction()) {
		case MotionEvent.ACTION_DOWN:
		mLastTouchPadStartTimeMs = time;
		mLastTouchNavigationStartTimeMs = time;
		mAlwaysInTapRegion = true;
		mTouchpadEnterXPosition = event.getX();
		mTouchpadEnterYPosition = event.getY();
		mTouchNavigationEnterXPosition = event.getX();
		mTouchNavigationEnterYPosition = event.getY();
		mAccumulatedX = 0;
		mAccumulatedY = 0;
		mLastMoveX = 0;
		@@ -173,8 +173,8 @@ class SimulatedDpad {
		break;
		case MotionEvent.ACTION_MOVE:
		// Determine whether the move is slop or an intentional move
		float deltaX = event.getX() - mTouchpadEnterXPosition;
		float deltaY = event.getY() - mTouchpadEnterYPosition;
		float deltaX = event.getX() - mTouchNavigationEnterXPosition;
		float deltaY = event.getY() - mTouchNavigationEnterYPosition;
		if (mTouchSlopSquared < deltaX * deltaX + deltaY * deltaY) {
		mAlwaysInTapRegion = false;
		}
		@@ -199,9 +199,9 @@ class SimulatedDpad {
		}
		}
		// Find the difference in position between the two most recent
		// touchpad events
		mLastMoveX = event.getX() - mLastTouchpadXPosition;
		mLastMoveY = event.getY() - mLastTouchpadYPosition;
		// TouchNavigation events
		mLastMoveX = event.getX() - mLastTouchNavigationXPosition;
		mLastMoveY = event.getY() - mLastTouchNavigationYPosition;
		mAccumulatedX += mLastMoveX;
		mAccumulatedY += mLastMoveY;
		float mAccumulatedXSquared = mAccumulatedX * mAccumulatedX;
		@@ -251,19 +251,19 @@ class SimulatedDpad {
		mAccumulatedY = isXAxis ? 0 : dominantAxis;

		mLastKeySent = key;
		mKeySendRateMs = (int) ((time - mLastTouchPadKeySendTimeMs) / repeatCount);
		mLastTouchPadKeySendTimeMs = time;
		mKeySendRateMs = (int) (time - mLastTouchNavigationKeySendTimeMs) / repeatCount;
		mLastTouchNavigationKeySendTimeMs = time;
		}
		break;
		case MotionEvent.ACTION_UP:
		if (time - mLastTouchPadStartTimeMs < MAX_TAP_TIME && mAlwaysInTapRegion) {
		if (time - mLastTouchNavigationStartTimeMs < MAX_TAP_TIME && mAlwaysInTapRegion) {
		if (synthesizeNewKeys) {
		viewroot.enqueueInputEvent(new KeyEvent(mLastTouchPadStartTimeMs, time,
		KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER, 0,
		viewroot.enqueueInputEvent(new KeyEvent(mLastTouchNavigationStartTimeMs,
		time, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER, 0,
		event.getMetaState(), event.getDeviceId(), 0,
		KeyEvent.FLAG_FALLBACK, event.getSource()));
		viewroot.enqueueInputEvent(new KeyEvent(mLastTouchPadStartTimeMs, time,
		KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER, 0,
		viewroot.enqueueInputEvent(new KeyEvent(mLastTouchNavigationStartTimeMs,
		time, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER, 0,
		event.getMetaState(), event.getDeviceId(), 0,
		KeyEvent.FLAG_FALLBACK, event.getSource()));
		}
		@@ -272,7 +272,7 @@ class SimulatedDpad {
		float yMoveSquared = mLastMoveY * mLastMoveY;
		// Determine whether the last gesture was a fling.
		if (mMinFlickDistanceSquared <= xMoveSquared + yMoveSquared &&
		time - mLastTouchPadEventTimeMs <= MAX_TAP_TIME &&
		time - mLastTouchNavigationEventTimeMs <= MAX_TAP_TIME &&
		mKeySendRateMs <= mMaxRepeatDelay && mKeySendRateMs > 0) {
		mLastDeviceId = event.getDeviceId();
		mLastSource = event.getSource();
		@@ -291,8 +291,8 @@ class SimulatedDpad {
		}

		// Store touch event position and time
		mLastTouchPadEventTimeMs = time;
		mLastTouchpadXPosition = event.getX();
		mLastTouchpadYPosition = event.getY();
		mLastTouchNavigationEventTimeMs = time;
		mLastTouchNavigationXPosition = event.getX();
		mLastTouchNavigationYPosition = event.getY();
		}
		}

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -8111,13 +8111,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* delivered to the focused view.
		* </p>
		* <pre> public boolean onGenericMotionEvent(MotionEvent event) {
		* if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
		* if (event.isFromSource(InputDevice.SOURCE_CLASS_JOYSTICK)) {
		* if (event.getAction() == MotionEvent.ACTION_MOVE) {
		* // process the joystick movement...
		* return true;
		* }
		* }
		* if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0) {
		* if (event.isFromSource(InputDevice.SOURCE_CLASS_POINTER)) {
		* switch (event.getAction()) {
		* case MotionEvent.ACTION_HOVER_MOVE:
		* // process the mouse hover movement...