Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable settings transition" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-22 13:51:56 +00:00
committed by Android (Google) Code Review
parent f2601b5853 ee0975a71b
commit 4ea2241322
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/SettingsTransitionActivity.java
View File

@@ -27,6 +27,7 @@ import android.widget.Toolbar;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.os.BuildCompat;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import com.android.settingslib.transition.SettingsTransitionHelper; import com.android.settingslib.transition.SettingsTransitionHelper;
@@ -41,7 +42,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity {
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { if (BuildCompat.isAtLeastS()) {
getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS); getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
SettingsTransitionHelper.applyForwardTransition(this); SettingsTransitionHelper.applyForwardTransition(this);
SettingsTransitionHelper.applyBackwardTransition(this); SettingsTransitionHelper.applyBackwardTransition(this);
@@ -51,7 +52,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity {
@Override @Override
public void startActivity(Intent intent) { public void startActivity(Intent intent) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { if (!BuildCompat.isAtLeastS()) {
super.startActivity(intent); super.startActivity(intent);
return; return;
} }
@@ -67,7 +68,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity {
@Override @Override
public void startActivity(Intent intent, @Nullable Bundle options) { public void startActivity(Intent intent, @Nullable Bundle options) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { if (!BuildCompat.isAtLeastS()) {
super.startActivity(intent, options); super.startActivity(intent, options);
return; return;
} }
@@ -82,7 +83,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity {
@Override @Override
public void startActivityForResult(Intent intent, int requestCode) { 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); super.startActivityForResult(intent, requestCode);
return; return;
} }
@@ -98,7 +99,7 @@ public abstract class SettingsTransitionActivity extends FragmentActivity {
@Override @Override
public void startActivityForResult(Intent intent, int requestCode, @Nullable Bundle options) { 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); super.startActivityForResult(intent, requestCode, options);
return; return;
} }