Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b62fb75d authored by Edgar Wang's avatar Edgar Wang
Browse files

If page launched by SuW, don't apply edge to edge 

Also disable fitsSystemWindows to false by SuW's requirement

Bug: 400866469
Test: manual
Flag: EXEMPT bug fix
Change-Id: Iec670c0d7a5547083d364992858f0648bcba7ffd
parent deebcef3

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) {