am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev (59159672) · Commits · e / os / android_frameworks_base

core/java/android/app/ActionBar.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1061,6 +1061,10 @@ public abstract class ActionBar {
		return false;
		}

		/** @hide */
		public void setWindowTitle(CharSequence title) {
		}

		/**
		* Listener interface for ActionBar navigation events.
		*

+3 −3

Original line number	Diff line number	Diff line
		@@ -5038,9 +5038,9 @@ public class Activity extends ContextThemeWrapper
		win.setTitleColor(color);
		}
		}
		}
		if (mActionBar != null) {
		mActionBar.setTitle(title);
		mActionBar.setWindowTitle(title);
		}
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -225,6 +225,11 @@ public class ToolbarActionBar extends ActionBar {
		mDecorToolbar.setTitle(resId != 0 ? mDecorToolbar.getContext().getText(resId) : null);
		}

		@Override
		public void setWindowTitle(CharSequence title) {
		mDecorToolbar.setWindowTitle(title);
		}

		@Override
		public void setSubtitle(CharSequence subtitle) {
		mDecorToolbar.setSubtitle(subtitle);

+5 −0

Original line number	Diff line number	Diff line
		@@ -431,6 +431,11 @@ public class WindowDecorActionBar extends ActionBar implements
		mDecorToolbar.setTitle(title);
		}

		@Override
		public void setWindowTitle(CharSequence title) {
		mDecorToolbar.setWindowTitle(title);
		}

		public void setSubtitle(CharSequence subtitle) {
		mDecorToolbar.setSubtitle(subtitle);
		}

+11 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,8 @@ public class ToolbarWidgetWrapper implements DecorToolbar {
		}

		a.recycle();
		} else {
		mDisplayOpts = detectDisplayOptions();
		}

		if (TextUtils.isEmpty(mToolbar.getNavigationContentDescription())) {
		@@ -181,6 +183,15 @@ public class ToolbarWidgetWrapper implements DecorToolbar {
		});
		}

		private int detectDisplayOptions() {
		int opts = ActionBar.DISPLAY_SHOW_TITLE \| ActionBar.DISPLAY_SHOW_HOME \|
		ActionBar.DISPLAY_USE_LOGO;
		if (mToolbar.getNavigationIcon() != null) {
		opts \|= ActionBar.DISPLAY_HOME_AS_UP;
		}
		return opts;
		}

		@Override
		public ViewGroup getViewGroup() {
		return mToolbar;