resolved conflicts for merge of f652551b to master (b31c3610) · Commits · e / os / android_frameworks_base

core/java/android/view/InputDevice.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -533,7 +533,6 @@ public final class InputDevice implements Parcelable {
	*		*
	* @see MotionEvent#AXIS_X		* @see MotionEvent#AXIS_X
	* @see MotionEvent#AXIS_Y		* @see MotionEvent#AXIS_Y
	* @see #getSupportedAxes()
	*/		*/
	public MotionRange getMotionRange(int axis) {		public MotionRange getMotionRange(int axis) {
	final int numRanges = mMotionRanges.size();		final int numRanges = mMotionRanges.size();
	@@ -559,7 +558,6 @@ public final class InputDevice implements Parcelable {
	*		*
	* @see MotionEvent#AXIS_X		* @see MotionEvent#AXIS_X
	* @see MotionEvent#AXIS_Y		* @see MotionEvent#AXIS_Y
	* @see #getSupportedAxes()
	*/		*/
	public MotionRange getMotionRange(int axis, int source) {		public MotionRange getMotionRange(int axis, int source) {
	final int numRanges = mMotionRanges.size();		final int numRanges = mMotionRanges.size();

core/java/android/view/KeyEvent.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2822,7 +2822,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
	*		*
	* @param symbolicName The symbolic name of the keycode.		* @param symbolicName The symbolic name of the keycode.
	* @return The keycode or {@link #KEYCODE_UNKNOWN} if not found.		* @return The keycode or {@link #KEYCODE_UNKNOWN} if not found.
	* @see #keycodeToString		* @see #keycodeToString(int)
	*/		*/
	public static int keyCodeFromString(String symbolicName) {		public static int keyCodeFromString(String symbolicName) {
	if (symbolicName == null) {		if (symbolicName == null) {

core/java/android/view/MotionEvent.java

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1947,8 +1947,6 @@ public final class MotionEvent extends InputEvent implements Parcelable {
	* @see #TOOL_TYPE_FINGER		* @see #TOOL_TYPE_FINGER
	* @see #TOOL_TYPE_STYLUS		* @see #TOOL_TYPE_STYLUS
	* @see #TOOL_TYPE_MOUSE		* @see #TOOL_TYPE_MOUSE
	* @see #TOOL_TYPE_INDIRECT_FINGER
	* @see #TOOL_TYPE_INDIRECT_STYLUS
	*/		*/
	public final int getToolType(int pointerIndex) {		public final int getToolType(int pointerIndex) {
	return nativeGetToolType(mNativePtr, pointerIndex);		return nativeGetToolType(mNativePtr, pointerIndex);
	@@ -2190,7 +2188,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
	* on the screen, before it had been adjusted for the containing window		* on the screen, before it had been adjusted for the containing window
	* and views.		* and views.
	*		*
	* @see getX()		* @see #getX(int)
	* @see #AXIS_X		* @see #AXIS_X
	*/		*/
	public final float getRawX() {		public final float getRawX() {
	@@ -2203,7 +2201,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
	* on the screen, before it had been adjusted for the containing window		* on the screen, before it had been adjusted for the containing window
	* and views.		* and views.
	*		*
	* @see getY()		* @see #getY(int)
	* @see #AXIS_Y		* @see #AXIS_Y
	*/		*/
	public final float getRawY() {		public final float getRawY() {
	@@ -3063,7 +3061,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
	*		*
	* @param symbolicName The symbolic name of the axis.		* @param symbolicName The symbolic name of the axis.
	* @return The axis or -1 if not found.		* @return The axis or -1 if not found.
	* @see #keycodeToString		* @see KeyEvent#keycodeToString(int)
	*/		*/
	public static int axisFromString(String symbolicName) {		public static int axisFromString(String symbolicName) {
	if (symbolicName == null) {		if (symbolicName == null) {