Fix bug 4729242 - Crash while launching browser app. (15a16a83) · Commits · e / os / android_frameworks_base

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

+35 −23

Original line number	Diff line number	Diff line
		@@ -463,7 +463,7 @@ public class ActionBarView extends AbsActionBarView {
		}
		}

		if ((flagsChanged &
		if (mTitleLayout != null && (flagsChanged &
		(ActionBar.DISPLAY_HOME_AS_UP \| ActionBar.DISPLAY_SHOW_HOME)) != 0) {
		final boolean homeAsUp = (options & ActionBar.DISPLAY_HOME_AS_UP) != 0;
		final boolean titleUp = homeAsUp && !showHome;
		@@ -650,6 +650,7 @@ public class ActionBarView extends AbsActionBarView {
		}

		private void initTitle() {
		if (mTitleLayout == null) {
		LayoutInflater inflater = LayoutInflater.from(getContext());
		mTitleLayout = (LinearLayout) inflater.inflate(R.layout.action_bar_title_item, null);
		mTitleView = (TextView) mTitleLayout.findViewById(R.id.action_bar_title);
		@@ -673,6 +674,13 @@ public class ActionBarView extends AbsActionBarView {
		mSubtitleView.setVisibility(VISIBLE);
		}

		final boolean homeAsUp = (mDisplayOptions & ActionBar.DISPLAY_HOME_AS_UP) != 0;
		final boolean titleUp = homeAsUp &&
		(mDisplayOptions & ActionBar.DISPLAY_SHOW_HOME) == 0;
		mTitleUpView.setVisibility(titleUp ? VISIBLE : GONE);
		mTitleLayout.setEnabled(titleUp);
		}

		addView(mTitleLayout);
		}

		@@ -1209,7 +1217,7 @@ public class ActionBarView extends AbsActionBarView {
		addView(mExpandedHomeLayout);
		}
		mHomeLayout.setVisibility(GONE);
		mTitleLayout.setVisibility(GONE);
		if (mTitleLayout != null) mTitleLayout.setVisibility(GONE);
		if (mTabScrollView != null) mTabScrollView.setVisibility(GONE);
		if (mSpinner != null) mSpinner.setVisibility(GONE);
		if (mCustomNavView != null) mCustomNavView.setVisibility(GONE);
		@@ -1226,8 +1234,12 @@ public class ActionBarView extends AbsActionBarView {
		mHomeLayout.setVisibility(VISIBLE);
		}
		if ((mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0) {
		if (mTitleLayout == null) {
		initTitle();
		} else {
		mTitleLayout.setVisibility(VISIBLE);
		}
		}
		if (mTabScrollView != null && mNavigationMode == ActionBar.NAVIGATION_MODE_TABS) {
		mTabScrollView.setVisibility(VISIBLE);
		}