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

Commit 24973881 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Clean up the feature flag of the edge to edge enforcement" into main

parents 561333ef e8b4c55a

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

+1 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin; 
import com.android.settingslib.transition.SettingsTransitionHelper.TransitionType;

import com.android.settingslib.widget.ExpressiveDesignEnabledProvider;

import com.android.settingslib.widget.SettingsThemeHelper;

import com.android.window.flags.Flags;



import com.google.android.material.appbar.AppBarLayout;

import com.google.android.material.appbar.CollapsingToolbarLayout;
@@ -121,7 +120,7 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa 
            finish();

        }

        final long startTime = System.currentTimeMillis();

        if (Flags.enforceEdgeToEdge() && !isAnySetupWizard) {

        if (!isAnySetupWizard) {

            Utils.setupEdgeToEdge(this);

            hideInternalActionBar();

        }