Merge "If page launched by SuW, don't apply edge to edge" into main (918cf7c9) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/core/SettingsBaseActivity.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
		finish();
		}
		final long startTime = System.currentTimeMillis();
		if (Flags.enforceEdgeToEdge()) {
		if (Flags.enforceEdgeToEdge() && !isAnySetupWizard) {
		Utils.setupEdgeToEdge(this);
		hideInternalActionBar();
		}
		@@ -136,6 +136,10 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
		super.setContentView(R.layout.settings_base_layout);
		}

		if (isAnySetupWizard) {
		findViewById(R.id.content_parent).setFitsSystemWindows(false);
		}

		// This is to hide the toolbar from those pages which don't need a toolbar originally.
		final Toolbar toolbar = findViewById(R.id.action_bar);
		if (!isToolbarEnabled() \|\| isAnySetupWizard) {