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

Commit dcf663bb authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] override expressive flag when launched by SUW" into main

parents d809269b d745cd46

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

+15 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.res.TypedArray;

import android.os.Bundle;

import android.os.SystemProperties;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;
@@ -44,6 +45,7 @@ import com.android.settingslib.collapsingtoolbar.FloatingToolbarHandler; 
import com.android.settingslib.collapsingtoolbar.widget.ScrollableToolbarItemLayout;

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;
@@ -59,7 +61,7 @@ import java.util.List; 


/** Base activity for Settings pages */

public class SettingsBaseActivity extends FragmentActivity implements CategoryHandler,

        FloatingToolbarHandler {

        FloatingToolbarHandler, ExpressiveDesignEnabledProvider {



    /**

     * What type of page transition should be apply.
@@ -75,6 +77,9 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa 
    private static final int COLLAPSING_LAYOUT_ID =

            com.android.settingslib.collapsingtoolbar.R.layout.collapsing_toolbar_base_layout;



    private static final String SETUPWIZARD_THEME_PROP = "setupwizard.theme";

    private static final String SETUPWIZARD_THEME_PREFIX = "glif_expressive";





    protected CategoryMixin mCategoryMixin;

    protected CollapsingToolbarLayout mCollapsingToolbarLayout;
@@ -322,6 +327,15 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa 
        return mToolbardelegate;

    }



    @Override

    public boolean isExpressiveDesignEnabled() {

        if (!WizardManagerHelper.isAnySetupWizard(getIntent())) {

            return SettingsThemeHelper.isExpressiveDesignEnabled();

        }



        return SystemProperties.get(SETUPWIZARD_THEME_PROP).startsWith(SETUPWIZARD_THEME_PREFIX);

    }



    private class EmptyDelegateCallback implements CollapsingToolbarDelegate.HostCallback {

        @Nullable

        @Override