Merge "Prevent app bar title from drawing twice" into sc-dev (50129cc4) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/core/SettingsBaseActivity.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -184,17 +184,19 @@ public class SettingsBaseActivity extends FragmentActivity {
		public void setTitle(CharSequence title) {
		if (mCollapsingToolbarLayout != null) {
		mCollapsingToolbarLayout.setTitle(title);
		}
		} else {
		super.setTitle(title);
		}
		}

		@Override
		public void setTitle(int titleId) {
		if (mCollapsingToolbarLayout != null) {
		mCollapsingToolbarLayout.setTitle(getText(titleId));
		}
		} else {
		super.setTitle(titleId);
		}
		}

		/**
		* SubSetting page should show a toolbar by default. If the page wouldn't show a toolbar,