Merge "Cursor background attribute made public" (b153bc9d) · Commits · e / os / android_frameworks_base

api/current.xml

+12 −1

Original line number	Diff line number	Diff line
		@@ -9937,6 +9937,17 @@
		visibility="public"
		>
		</field>
		<field name="textCursorDrawable"
		type="int"
		transient="false"
		volatile="false"
		value="16843618"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="textEditNoPasteWindowLayout"
		type="int"
		transient="false"
		@@ -266626,7 +266637,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="arg0" type="T">
		<parameter name="t" type="T">
		</parameter>
		</method>
		</interface>

+5 −3

Original line number	Diff line number	Diff line
		@@ -1642,7 +1642,9 @@
		<!-- Default icon for applications that don't specify an icon. -->
		<public type="mipmap" name="sym_def_app_icon" id="0x010d0000" />

		<!-- Theme attribute used to customize the text insertion cursor -->
		<!-- Commented out for HC MR1 to prevent an API change -->
		<!-- <public type="attr" name="textCursorDrawable" id="0x01010362" /> -->
		<!-- ===============================================================
		Resources added in version 12 of the platform (Honeycomb / 3.1)
		=============================================================== -->
		<eat-comment />
		<public type="attr" name="textCursorDrawable" id="0x01010362" />
		</resources>