diff options
3 files changed, 7 insertions, 1 deletions
diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/non_collapsing_toolbar_base_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/non_collapsing_toolbar_base_layout.xml index 1e48443fcf13..a49f4bee89a0 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/non_collapsing_toolbar_base_layout.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/non_collapsing_toolbar_base_layout.xml @@ -19,7 +19,8 @@ android:id="@+id/content_parent" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:filterTouchesWhenObscured="false"> <include layout="@layout/non_collapsing_toolbar_content_layout"/> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarDelegate.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarDelegate.java index 01ecb66fed1a..de0d60916b3d 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarDelegate.java +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarDelegate.java @@ -89,6 +89,10 @@ public class CollapsingToolbarDelegate { private boolean mIsExpressiveTheme; + public CollapsingToolbarDelegate(@NonNull HostCallback hostCallback) { + this(hostCallback, /* useCollapsingToolbar= */ true); + } + public CollapsingToolbarDelegate(@NonNull HostCallback hostCallback, boolean useCollapsingToolbar) { mHostCallback = hostCallback; diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayout.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayout.java index 51d7504f136d..25d04009b6f8 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayout.java +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayout.java @@ -105,6 +105,7 @@ public class CollapsingCoordinatorLayout extends CoordinatorLayout { return true; } + @SuppressWarnings("RestrictTo") private void init() { int resId = SettingsThemeHelper.isExpressiveTheme(getContext()) ? R.layout.settingslib_expressive_collapsing_toolbar_content_layout |