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

Commit 250858e4 authored by Yi-Ling Chuang's avatar Yi-Ling Chuang
Browse files

Apply setup wizard's transition on a11y pages 

- Start a11y activities with transition type.
- Only play fade out transition on these activities with transition type.

Fixes: 174540259
Test: rebuild and launch pages from Vision Settings
Change-Id: I7e8e0ee8cdb7a3f99cfc9a6e2d1623e2970511b7
parent 8db5cb03

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
@@ -177,6 +177,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));

    }
@@ -266,6 +270,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();

    }