Merge "Prevent app bar title from drawing twice" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
50129cc4db
@@ -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,
|
||||
|
Reference in New Issue
Block a user