commit 7b163e256644e02a764d28bfc0812f3e17d8789c
author Mill Chen <millchen@google.com> Thu Jan 14 18:33:46 2021 +0800
committer Mill Chen <millchen@google.com> Fri Jan 15 14:43:30 2021 +0800
tree 1c8fb140fe31f85c3ee40812da37b1d735ae9b98
parent 78c66569819344d793d4fe1c41b6ad15a64b5f6c

Remove redundant toolbar from CollapsingToolbarLayout

The new material library has been updated to be able to support
android.widget.Toolbar, so the redundant toolbar has to be removed.

Bug: 176882938
Test: visual verified
Change-Id: Ibada6b9d315c14d79e9f9f8015cbb5e00fbeea38

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 7f214f6..1c2952a 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -288,9 +288,7 @@
         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);
         }
         mSwitchBar = findViewById(R.id.switch_bar);
         if (mSwitchBar != null) {