diff --git a/res/layout/settings_collapsing_base_layout.xml b/res/layout/settings_collapsing_base_layout.xml index fe6449bd4ce..be7bf6c3cc3 100644 --- a/res/layout/settings_collapsing_base_layout.xml +++ b/res/layout/settings_collapsing_base_layout.xml @@ -23,7 +23,6 @@ android:transitionGroup="true"> @@ -39,21 +38,14 @@ app:statusBarScrim="?android:attr/colorPrimary" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:expandedTitleMarginStart="18dp" - app:toolbarId="@id/tool_bar"> - - + app:toolbarId="@id/action_bar"> + android:layout_height="?attr/actionBarSize" + android:theme="?android:attr/actionBarTheme" + app:layout_collapseMode="pin"/> diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index b53b8348535..bb20c4cbc0d 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -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) { diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java index 92f0054d2e7..b1b2321eeea 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java +++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java @@ -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());