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

Merge "Remove redundant toolbar from CollapsingToolbarLayout"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-15 10:21:38 +00:00
committed by Android (Google) Code Review
parent 5d7f5ddf18 7b163e2566
commit 0cb063c9e4
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/SettingsActivity.java
View File

@@ -306,9 +306,7 @@ public class SettingsActivity extends SettingsBaseActivity
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(!isInSetupWizard);
actionBar.setHomeButtonEnabled(!isInSetupWizard);
// TODO(b/176882938): Enable title after material component updated
// If CollapsingToolbarLayout is applied, the old action bar won't show title.
actionBar.setDisplayShowTitleEnabled(mCollapsingToolbarLayout == null);
actionBar.setDisplayShowTitleEnabled(true);
}
mMainSwitch = findViewById(R.id.switch_bar);
if (mMainSwitch != null) {

4
src/com/android/settings/network/telephony/MobileNetworkActivity.java
View File

@@ -115,9 +115,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
final ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
// TODO(b/176882938): Enable title after material component updated
// If CollapsingToolbarLayout is applied, the old action bar won't show title.
actionBar.setDisplayShowTitleEnabled(mCollapsingToolbarLayout == null);
actionBar.setDisplayShowTitleEnabled(true);
}
getProxySubscriptionManager().setLifecycle(getLifecycle());