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

Merge "Fix talkback issue on Subsettings" into sc-v2-dev am: 9928e585a6

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

Change-Id: I499c652bcad2b4969e7896f5746012e4b2466e04
This commit is contained in:
TreeHugger Robot
2021-11-24 10:06:52 +00:00
committed by Automerger Merge Worker
parent d61e61e630 9928e585a6
commit ed0b68a71b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,19 +187,17 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
@Override @Override
public void setTitle(CharSequence title) { public void setTitle(CharSequence title) {
super.setTitle(title);
if (mCollapsingToolbarLayout != null) { if (mCollapsingToolbarLayout != null) {
mCollapsingToolbarLayout.setTitle(title); mCollapsingToolbarLayout.setTitle(title);
} else {
super.setTitle(title);
} }
} }
@Override @Override
public void setTitle(int titleId) { public void setTitle(int titleId) {
super.setTitle(getText(titleId));
if (mCollapsingToolbarLayout != null) { if (mCollapsingToolbarLayout != null) {
mCollapsingToolbarLayout.setTitle(getText(titleId)); mCollapsingToolbarLayout.setTitle(getText(titleId));
} else {
super.setTitle(titleId);
} }
} }