From cbe9bebb8e0babae4480946cb0529fcc1e7b6603 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Thu, 23 Dec 2021 10:33:56 -0500 Subject: [PATCH] Start brightness dialog in same task That way, enter and exit animations can be overriden Test: manual Fixes: 210177675 Change-Id: I77c33a77e3128597bfe09d427ba0c06e7c78136e --- .../display/BrightnessLevelPreferenceController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index de4fe25bc98..171f4261561 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -19,6 +19,7 @@ import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX; import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MIN; import static com.android.settingslib.display.BrightnessUtils.convertLinearToGammaFloat; +import android.app.ActivityOptions; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -156,7 +157,11 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr final Intent intent = new Intent(ACTION_SHOW_BRIGHTNESS_DIALOG); intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE, SettingsTransitionHelper.TransitionType.TRANSITION_NONE); - mContext.startActivity(intent); + + // Start activity in the same task and pass fade animations + final ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, + android.R.anim.fade_in, android.R.anim.fade_out); + mContext.startActivityForResult(preference.getKey(), intent, 0, options.toBundle()); return true; }