PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-26 01:13:14 +00:00
committed by Android (Google) Code Review
parent a4fc228b55 250858e4be
commit 32ea479cc9
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -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();
}