— a/packages/apps/Settings/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/packages/apps/Settings/src/com/android/settings/core/SettingsBaseActivity.java
@@ -104,14 +104,14 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
setTheme(appliedTheme);
}
-
if (!isToolbarEnabled() && !isAnySetupWizard) {
-
if (isToolbarEnabled() && !isAnySetupWizard) { super.setContentView(R.layout.collapsing_toolbar_base_layout); mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar); mAppBarLayout = findViewById(R.id.app_bar); if (mCollapsingToolbarLayout != null) { mCollapsingToolbarLayout.setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER); }
-
disableCollapsingToolbarLayoutScrollingBehavior();
-
//disableCollapsingToolbarLayoutScrollingBehavior(); } else { super.setContentView(R.layout.settings_base_layout); }