Merge change 9649 (b1d39aae) · Commits · e / os / android_frameworks_base

api/current.xml

+36 −10

Original line number	Diff line number	Diff line
		@@ -145940,6 +145940,19 @@
		visibility="public"
		>
		</method>
		<method name="findPointerIndex"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pointerId" type="int">
		</parameter>
		</method>
		<method name="getAction"
		return="int"
		abstract="false"
		@@ -146031,7 +146044,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pointer" type="int">
		<parameter name="pointerIndex" type="int">
		</parameter>
		<parameter name="pos" type="int">
		</parameter>
		@@ -146059,7 +146072,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pointer" type="int">
		<parameter name="pointerIndex" type="int">
		</parameter>
		<parameter name="pos" type="int">
		</parameter>
		@@ -146087,7 +146100,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pointer" type="int">
		<parameter name="pointerIndex" type="int">
		</parameter>
		<parameter name="pos" type="int">
		</parameter>
		@@ -146115,7 +146128,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pointer" type="int">
		<parameter name="pointerIndex" type="int">
		</parameter>
		<parameter name="pos" type="int">
		</parameter>
		@@ -146153,6 +146166,19 @@
		visibility="public"
		>
		</method>
		<method name="getPointerId"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="index" type="int">
		</parameter>
		</method>
		<method name="getPressure"
		return="float"
		abstract="false"
		@@ -146174,7 +146200,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pointer" type="int">
		<parameter name="pointerIndex" type="int">
		</parameter>
		</method>
		<method name="getRawX"
		@@ -146220,7 +146246,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pointer" type="int">
		<parameter name="pointerIndex" type="int">
		</parameter>
		</method>
		<method name="getX"
		@@ -146244,7 +146270,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pointer" type="int">
		<parameter name="pointerIndex" type="int">
		</parameter>
		</method>
		<method name="getXPrecision"
		@@ -146279,7 +146305,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="pointer" type="int">
		<parameter name="pointerIndex" type="int">
		</parameter>
		</method>
		<method name="getYPrecision"
		@@ -146615,7 +146641,7 @@
		visibility="public"
		>
		</field>
		<field name="ACTION_POINTER_MASK"
		<field name="ACTION_POINTER_ID_MASK"
		type="int"
		transient="false"
		volatile="false"
		@@ -146626,7 +146652,7 @@
		visibility="public"
		>
		</field>
		<field name="ACTION_POINTER_SHIFT"
		<field name="ACTION_POINTER_ID_SHIFT"
		type="int"
		transient="false"
		volatile="false"