From 2694cd8c42a98431b3e75e3fc461f8c7a7a12fd2 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Thu, 6 May 2021 16:06:27 +0800 Subject: [PATCH] Fix Settings crash After enabling the view attribute inspection, Settings always gets crashed when entering any sub-setting pages. It's due to the undefined value set in the app:statusBarScrim. Using app:statusBarScrim="@empty" is trying to clear the CollapsingToolbarLayout's default statusBarScrim. So the value of the attribute can be replaced with other value that indicated null. This change also needs to make sure the collapsing toolbar leaves the same behavior as the one before changing. Eventually we use app:statusBarScrim="@null" instead to fix this issue. Fix: 186055380 Test: manual test 1) Enable developer options 2) Settings > System > Developer options 3) Enable view attribute inspection 4) See if Settings gets crashed Change-Id: Ic829bb11b67d5cfd4de626f79d4a5c3e0ebd8e67 --- .../res/layout-v31/collapsing_toolbar_base_layout.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml index 579a6b2037605..1990b0044d2c1 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml @@ -43,7 +43,7 @@ app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:scrimAnimationDuration="50" app:scrimVisibleHeightTrigger="@dimen/scrim_visible_height_trigger" - app:statusBarScrim="@empty" + app:statusBarScrim="@null" app:titleCollapseMode="fade" app:collapsedTitleTextAppearance="@style/CollapsingToolbarTitle.Collapsed" app:expandedTitleTextAppearance="@style/CollapsingToolbarTitle.Expanded"