Merge "Bug 2841148 - Add accessors for action bar context mode state." (0d60b96a) · Commits · e / os / android_frameworks_base

api/current.xml

+33 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19890,6 +19890,17 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
			<method name="getCustomView"
			return="android.view.View"
			abstract="true"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="getMenu"		<method name="getMenu"
	return="android.view.Menu"		return="android.view.Menu"
	abstract="true"		abstract="true"
	@@ -19901,6 +19912,28 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
			<method name="getSubtitle"
			return="java.lang.CharSequence"
			abstract="true"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getTitle"
			return="java.lang.CharSequence"
			abstract="true"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="invalidate"		<method name="invalidate"
	return="void"		return="void"
	abstract="true"		abstract="true"

core/java/android/app/ActionBar.java

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -368,6 +368,24 @@ public abstract class ActionBar {
	* @return The context mode's menu.		* @return The context mode's menu.
	*/		*/
	public abstract Menu getMenu();		public abstract Menu getMenu();

			/**
			* Returns the current title of this context mode.
			* @return Title text
			*/
			public abstract CharSequence getTitle();

			/**
			* Returns the current subtitle of this context mode.
			* @return Subtitle text
			*/
			public abstract CharSequence getSubtitle();

			/**
			* Returns the current custom view for this context mode.
			* @return The current custom view
			*/
			public abstract View getCustomView();
	}		}

	/**		/**

core/java/com/android/internal/app/ActionBarImpl.java

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,7 @@ import android.widget.LinearLayout;
	import android.widget.SpinnerAdapter;		import android.widget.SpinnerAdapter;
	import android.widget.ViewAnimator;		import android.widget.ViewAnimator;

			import java.lang.ref.WeakReference;
	import java.util.ArrayList;		import java.util.ArrayList;

	/**		/**
	@@ -338,6 +339,7 @@ public class ActionBarImpl extends ActionBar {
	public class ContextMode extends ActionBar.ContextMode {		public class ContextMode extends ActionBar.ContextMode {
	private ContextModeCallback mCallback;		private ContextModeCallback mCallback;
	private ActionMenu mMenu;		private ActionMenu mMenu;
			private WeakReference<View> mCustomView;

	public ContextMode(ContextModeCallback callback) {		public ContextMode(ContextModeCallback callback) {
	mCallback = callback;		mCallback = callback;
	@@ -375,6 +377,7 @@ public class ActionBarImpl extends ActionBar {
	@Override		@Override
	public void setCustomView(View view) {		public void setCustomView(View view) {
	mUpperContextView.setCustomView(view);		mUpperContextView.setCustomView(view);
			mCustomView = new WeakReference<View>(view);
	}		}

	@Override		@Override
	@@ -387,6 +390,21 @@ public class ActionBarImpl extends ActionBar {
	mUpperContextView.setTitle(title);		mUpperContextView.setTitle(title);
	}		}

			@Override
			public CharSequence getTitle() {
			return mUpperContextView.getTitle();
			}

			@Override
			public CharSequence getSubtitle() {
			return mUpperContextView.getSubtitle();
			}

			@Override
			public View getCustomView() {
			return mCustomView != null ? mCustomView.get() : null;
			}

	public void dispatchOnContextItemClicked(MenuItem item) {		public void dispatchOnContextItemClicked(MenuItem item) {
	ActionMenuItem actionItem = (ActionMenuItem) item;		ActionMenuItem actionItem = (ActionMenuItem) item;
	if (!actionItem.invoke()) {		if (!actionItem.invoke()) {

core/java/com/android/internal/widget/ActionBarContextView.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -105,6 +105,14 @@ public class ActionBarContextView extends ViewGroup {
	initTitle();		initTitle();
	}		}

			public CharSequence getTitle() {
			return mTitle;
			}

			public CharSequence getSubtitle() {
			return mSubtitle;
			}

	private void initTitle() {		private void initTitle() {
	if (mTitleLayout == null) {		if (mTitleLayout == null) {
	LayoutInflater inflater = LayoutInflater.from(getContext());		LayoutInflater inflater = LayoutInflater.from(getContext());