From db5ca4ee1a670c4cb9dbfd91fe4d404e3380e5f6 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Tue, 9 Mar 2021 15:10:22 +0800 Subject: [PATCH] Prevent app bar title from drawing twice Sometimes we could see a flick problem with app bar title. It appears to draw the app bar title twice. This CL is to prevent app bar title from rendering twice. Bug: 182232144 Test: robotests and visual verified 1) Open Settings app 2) Click on any entrypoint 3) Observe and see if there's a flick problem on app bar title Change-Id: I9f5b7cdd163f20dd7f85cf2f83b9ef01a473dd3c --- src/com/android/settings/core/SettingsBaseActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java index 85484af60df..cc78fa6d474 100644 --- a/src/com/android/settings/core/SettingsBaseActivity.java +++ b/src/com/android/settings/core/SettingsBaseActivity.java @@ -184,16 +184,18 @@ public class SettingsBaseActivity extends FragmentActivity { public void setTitle(CharSequence title) { if (mCollapsingToolbarLayout != null) { mCollapsingToolbarLayout.setTitle(title); + } else { + super.setTitle(title); } - super.setTitle(title); } @Override public void setTitle(int titleId) { if (mCollapsingToolbarLayout != null) { mCollapsingToolbarLayout.setTitle(getText(titleId)); + } else { + super.setTitle(titleId); } - super.setTitle(titleId); } /**