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

Commit 32ea479c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Apply setup wizard's transition on a11y pages" into sc-dev

parents a4fc228b 250858e4

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

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.settings.display.FontSizePreferenceFragmentForSetupWizard; 
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;
@@ -92,6 +93,7 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit 
                        : Instrumentable.METRICS_CATEGORY_UNKNOWN)

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

                        new Bundle()))

                .setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_FADE)

                .launch();

        return true;

    }
@@ -119,7 +121,8 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit 
                    .setArguments(args)

                    .setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN)

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

                            new Bundle()));

                            new Bundle()))

                    .setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_FADE);



            Log.d(LOG_TAG, "Launch font size settings");

            subSettingLauncher.launch();

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

+8 −0
Original line number Diff line number Diff line
@@ -178,6 +178,10 @@ public class SettingsBaseActivity extends FragmentActivity { 
        } else if (transitionType == TransitionType.TRANSITION_NONE) {

            super.startActivity(intent, null);

            return;

        } else if (transitionType == TransitionType.TRANSITION_FADE) {

            super.startActivity(intent, null);

            overridePendingTransition(android.R.anim.fade_in, R.anim.sud_stay);

            return;

        }

        super.startActivity(intent, createActivityOptionsBundleForTransition(null));

    }
@@ -267,6 +271,10 @@ public class SettingsBaseActivity extends FragmentActivity { 


    @Override

    protected void onPause() {

        // For accessibility activities launched from setup wizard.

        if (getTransitionType(getIntent()) == TransitionType.TRANSITION_FADE) {

            overridePendingTransition(R.anim.sud_stay, android.R.anim.fade_out);

        }

        unregisterReceiver(mPackageReceiver);

        super.onPause();

    }