From ee0975a71b9307079e074314ab633261c8f34c7e Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Thu, 22 Apr 2021 18:19:22 +0800 Subject: [PATCH] Enable settings transition As the framework bug is fixed, re-enable the transition by correcting the conditions. Bug: 177480673 Test: rebuild and test on the NotificaitonHistory page Change-Id: Icb62dad12ba5889f750d0ea2765ae76186fc79e7 --- .../collapsingtoolbar/SettingsTransitionActivity.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/SettingsTransitionActivity.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/SettingsTransitionActivity.java index 47551dfe84226..c47638ac239b0 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/SettingsTransitionActivity.java +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/SettingsTransitionActivity.java @@ -27,6 +27,7 @@ import android.widget.Toolbar; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.os.BuildCompat; import androidx.fragment.app.FragmentActivity; import com.android.settingslib.transition.SettingsTransitionHelper; @@ -41,7 +42,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + if (BuildCompat.isAtLeastS()) { getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS); SettingsTransitionHelper.applyForwardTransition(this); SettingsTransitionHelper.applyBackwardTransition(this); @@ -51,7 +52,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity { @Override public void startActivity(Intent intent) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { + if (!BuildCompat.isAtLeastS()) { super.startActivity(intent); return; } @@ -67,7 +68,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity { @Override public void startActivity(Intent intent, @Nullable Bundle options) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { + if (!BuildCompat.isAtLeastS()) { super.startActivity(intent, options); return; } @@ -82,7 +83,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity { @Override public void startActivityForResult(Intent intent, int requestCode) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || requestCode == DEFAULT_REQUEST) { + if (!BuildCompat.isAtLeastS() || requestCode == DEFAULT_REQUEST) { super.startActivityForResult(intent, requestCode); return; } @@ -98,7 +99,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity { @Override public void startActivityForResult(Intent intent, int requestCode, @Nullable Bundle options) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || requestCode == DEFAULT_REQUEST) { + if (!BuildCompat.isAtLeastS() || requestCode == DEFAULT_REQUEST) { super.startActivityForResult(intent, requestCode, options); return; }