Merge "Action bar API updates - new display options" (2308628a) · Commits · e / os / android_frameworks_base

api/current.xml

+264 −20

Original line number	Diff line number	Diff line
		@@ -1894,7 +1894,7 @@
		type="int"
		transient="false"
		volatile="false"
		value="16843549"
		value="16843550"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -1905,7 +1905,7 @@
		type="int"
		transient="false"
		volatile="false"
		value="16843548"
		value="16843549"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -1916,7 +1916,7 @@
		type="int"
		transient="false"
		volatile="false"
		value="16843550"
		value="16843551"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -4717,6 +4717,17 @@
		visibility="public"
		>
		</field>
		<field name="homeAsUpIndicator"
		type="int"
		transient="false"
		volatile="false"
		value="16843548"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="horizontalDivider"
		type="int"
		transient="false"
		@@ -9286,7 +9297,7 @@
		type="int"
		transient="false"
		volatile="false"
		value="16843552"
		value="16843553"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -9297,7 +9308,7 @@
		type="int"
		transient="false"
		volatile="false"
		value="16843551"
		value="16843552"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -19449,6 +19460,17 @@
		visibility="public"
		>
		</method>
		<method name="getNavigationItemCount"
		return="int"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getNavigationMode"
		return="int"
		abstract="true"
		@@ -19460,7 +19482,7 @@
		visibility="public"
		>
		</method>
		<method name="getSelectedNavigationItem"
		<method name="getSelectedNavigationIndex"
		return="int"
		abstract="true"
		native="false"
		@@ -19471,6 +19493,17 @@
		visibility="public"
		>
		</method>
		<method name="getSelectedNavigationItem"
		return="int"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		<method name="getSelectedTab"
		return="android.app.ActionBar.Tab"
		abstract="true"
		@@ -19493,6 +19526,19 @@
		visibility="public"
		>
		</method>
		<method name="getTabAt"
		return="android.app.ActionBar.Tab"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="index" type="int">
		</parameter>
		</method>
		<method name="getTitle"
		return="java.lang.CharSequence"
		abstract="true"
		@@ -19537,6 +19583,17 @@
		visibility="public"
		>
		</method>
		<method name="removeAllTabs"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="removeTab"
		return="void"
		abstract="true"
		@@ -19590,6 +19647,32 @@
		</parameter>
		</method>
		<method name="setCustomNavigationMode"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="view" type="android.view.View">
		</parameter>
		</method>
		<method name="setCustomView"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="view" type="android.view.View">
		</parameter>
		</method>
		<method name="setCustomView"
		return="void"
		abstract="true"
		native="false"
		@@ -19601,6 +19684,8 @@
		>
		<parameter name="view" type="android.view.View">
		</parameter>
		<parameter name="layoutParams" type="android.app.ActionBar.LayoutParams">
		</parameter>
		</method>
		<method name="setDisplayOptions"
		return="void"
		@@ -19637,7 +19722,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="adapter" type="android.widget.SpinnerAdapter">
		@@ -19652,7 +19737,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="adapter" type="android.widget.SpinnerAdapter">
		@@ -19662,6 +19747,34 @@
		<parameter name="defaultSelectedPosition" type="int">
		</parameter>
		</method>
		<method name="setListNavigationCallbacks"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="adapter" type="android.widget.SpinnerAdapter">
		</parameter>
		<parameter name="callback" type="android.app.ActionBar.NavigationCallback">
		</parameter>
		</method>
		<method name="setNavigationMode"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="mode" type="int">
		</parameter>
		</method>
		<method name="setSelectedNavigationItem"
		return="void"
		abstract="true"
		@@ -19682,7 +19795,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -19719,7 +19832,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -19761,6 +19874,39 @@
		>
		</method>
		<field name="DISPLAY_HIDE_HOME"
		type="int"
		transient="false"
		volatile="false"
		value="4096"
		static="true"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		<field name="DISPLAY_HOME_AS_UP"
		type="int"
		transient="false"
		volatile="false"
		value="4"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="DISPLAY_SHOW_CUSTOM"
		type="int"
		transient="false"
		volatile="false"
		value="16"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="DISPLAY_SHOW_HOME"
		type="int"
		transient="false"
		volatile="false"
		@@ -19771,22 +19917,22 @@
		visibility="public"
		>
		</field>
		<field name="DISPLAY_USE_LOGO"
		<field name="DISPLAY_SHOW_TITLE"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		value="8"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="NAVIGATION_MODE_CUSTOM"
		<field name="DISPLAY_USE_LOGO"
		type="int"
		transient="false"
		volatile="false"
		value="3"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -19794,6 +19940,17 @@
		>
		</field>
		<field name="NAVIGATION_MODE_DROPDOWN_LIST"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		<field name="NAVIGATION_MODE_LIST"
		type="int"
		transient="false"
		volatile="false"
		@@ -19827,6 +19984,93 @@
		>
		</field>
		</class>
		<class name="ActionBar.LayoutParams"
		extends="android.view.ViewGroup.MarginLayoutParams"
		abstract="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<constructor name="ActionBar.LayoutParams"
		type="android.app.ActionBar.LayoutParams"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="c" type="android.content.Context">
		</parameter>
		<parameter name="attrs" type="android.util.AttributeSet">
		</parameter>
		</constructor>
		<constructor name="ActionBar.LayoutParams"
		type="android.app.ActionBar.LayoutParams"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="width" type="int">
		</parameter>
		<parameter name="height" type="int">
		</parameter>
		</constructor>
		<constructor name="ActionBar.LayoutParams"
		type="android.app.ActionBar.LayoutParams"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="width" type="int">
		</parameter>
		<parameter name="height" type="int">
		</parameter>
		<parameter name="gravity" type="int">
		</parameter>
		</constructor>
		<constructor name="ActionBar.LayoutParams"
		type="android.app.ActionBar.LayoutParams"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="gravity" type="int">
		</parameter>
		</constructor>
		<constructor name="ActionBar.LayoutParams"
		type="android.app.ActionBar.LayoutParams"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="source" type="android.app.ActionBar.LayoutParams">
		</parameter>
		</constructor>
		<constructor name="ActionBar.LayoutParams"
		type="android.app.ActionBar.LayoutParams"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="source" type="android.view.ViewGroup.LayoutParams">
		</parameter>
		</constructor>
		<field name="gravity"
		type="int"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<interface name="ActionBar.NavigationCallback"
		abstract="true"
		static="true"
		@@ -19933,7 +20177,7 @@
		>
		</method>
		<method name="setCustomView"
		return="void"
		return="android.app.ActionBar.Tab"
		abstract="true"
		native="false"
		synchronized="false"
		@@ -19946,7 +20190,7 @@
		</parameter>
		</method>
		<method name="setIcon"
		return="void"
		return="android.app.ActionBar.Tab"
		abstract="true"
		native="false"
		synchronized="false"
		@@ -19959,7 +20203,7 @@
		</parameter>
		</method>
		<method name="setTabListener"
		return="void"
		return="android.app.ActionBar.Tab"
		abstract="true"
		native="false"
		synchronized="false"
		@@ -19972,7 +20216,7 @@
		</parameter>
		</method>
		<method name="setTag"
		return="void"
		return="android.app.ActionBar.Tab"
		abstract="true"
		native="false"
		synchronized="false"
		@@ -19985,7 +20229,7 @@
		</parameter>
		</method>
		<method name="setText"
		return="void"
		return="android.app.ActionBar.Tab"
		abstract="true"
		native="false"
		synchronized="false"
		@@ -245127,7 +245371,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="arg0" type="T">
		<parameter name="t" type="T">
		</parameter>
		</method>
		</interface>