PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent app bar title from drawing twice" into sc-dev am: 50129cc4db

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I039672dcf9ba137de488662cdaf963cc195ee2e1
This commit is contained in:
TreeHugger Robot
2021-03-10 14:04:47 +00:00
committed by Automerger Merge Worker
parent 4895c08f6e 50129cc4db
commit aef33faecd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -184,16 +184,18 @@ public class SettingsBaseActivity extends FragmentActivity {
public void setTitle(CharSequence title) { public void setTitle(CharSequence title) {
if (mCollapsingToolbarLayout != null) { if (mCollapsingToolbarLayout != null) {
mCollapsingToolbarLayout.setTitle(title); mCollapsingToolbarLayout.setTitle(title);
} else {
super.setTitle(title);
} }
super.setTitle(title);
} }
@Override @Override
public void setTitle(int titleId) { public void setTitle(int titleId) {
if (mCollapsingToolbarLayout != null) { if (mCollapsingToolbarLayout != null) {
mCollapsingToolbarLayout.setTitle(getText(titleId)); mCollapsingToolbarLayout.setTitle(getText(titleId));
} else {
super.setTitle(titleId);
} }
super.setTitle(titleId);
} }
/** /**