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

Commit c76b5689 authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Update Settings animation to use new slide style when in SUW." into udc-dev

parents cbbab363 81f1b783

src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.settings.core.SubSettingLauncher; 
import com.android.settings.search.actionbar.SearchMenuController;

import com.android.settings.support.actionbar.HelpResourceProvider;

import com.android.settingslib.core.instrumentation.Instrumentable;

import com.android.settingslib.transition.SettingsTransitionHelper;



import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.util.ThemeHelper;
@@ -84,7 +83,6 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit 
                        : Instrumentable.METRICS_CATEGORY_UNKNOWN)

                .setExtras(SetupWizardUtils.copyLifecycleExtra(getIntent().getExtras(),

                        new Bundle()))

                .setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_FADE)

                .launch();

        return true;

    }

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

+6 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.google.android.material.appbar.AppBarLayout; 
import com.google.android.material.appbar.CollapsingToolbarLayout;

import com.google.android.material.resources.TextAppearanceConfig;

import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.transition.TransitionHelper;

import com.google.android.setupdesign.util.ThemeHelper;



/** Base activity for Settings pages */
@@ -77,6 +78,11 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa 


    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {

        final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());

        if (isAnySetupWizard) {

            TransitionHelper.applyForwardTransition(this);

            TransitionHelper.applyBackwardTransition(this);

        }

        super.onCreate(savedInstanceState);

        if (isFinishing()) {

            return;
@@ -97,7 +103,6 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa 
            requestWindowFeature(Window.FEATURE_NO_TITLE);

        }

        // Apply SetupWizard light theme during setup flow. This is for SubSettings pages.

        final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());

        if (isAnySetupWizard && this instanceof SubSettings) {

            setTheme(SetupWizardUtils.getTheme(this, getIntent()));

            setTheme(R.style.SettingsPreferenceTheme_SetupWizard);