Merge "Prevent app bar title from drawing twice" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-03-09 09:20:58 +00:00
committed by Android (Google) Code Review

View File

@@ -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,