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

Merge "Merge existing bundle with ActivityOptions" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-10 06:05:37 +00:00
committed by Android (Google) Code Review
parent 72c3debb0b 377410de6d
commit 57d8d38a3c
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,10 +148,14 @@ public class SettingsBaseActivity extends FragmentActivity {
@Override @Override
public void startActivity(Intent intent, @androidx.annotation.Nullable Bundle options) { public void startActivity(Intent intent, @androidx.annotation.Nullable Bundle options) {
if (!Utils.isPageTransitionEnabled(this) || options != null) { if (!Utils.isPageTransitionEnabled(this)) {
super.startActivity(intent, options); super.startActivity(intent, options);
return; return;
} }
if (options != null) {
super.startActivity(intent, getMergedBundleForTransition(options));
return;
}
super.startActivity(intent, getActivityOptionsBundle()); super.startActivity(intent, getActivityOptionsBundle());
} }
@@ -169,11 +173,15 @@ public class SettingsBaseActivity extends FragmentActivity {
@Override @Override
public void startActivityForResult(Intent intent, int requestCode, public void startActivityForResult(Intent intent, int requestCode,
@androidx.annotation.Nullable Bundle options) { @androidx.annotation.Nullable Bundle options) {
if (!Utils.isPageTransitionEnabled(this) || requestCode == DEFAULT_REQUEST if (!Utils.isPageTransitionEnabled(this) || requestCode == DEFAULT_REQUEST) {
|| options != null) {
super.startActivityForResult(intent, requestCode, options); super.startActivityForResult(intent, requestCode, options);
return; return;
} }
if (options != null) {
super.startActivityForResult(intent, requestCode,
getMergedBundleForTransition(options));
return;
}
super.startActivityForResult(intent, requestCode, getActivityOptionsBundle()); super.startActivityForResult(intent, requestCode, getActivityOptionsBundle());
} }
@@ -339,6 +347,16 @@ public class SettingsBaseActivity extends FragmentActivity {
"shared_element_view").toBundle(); "shared_element_view").toBundle();
} }
private Bundle getMergedBundleForTransition(@NonNull Bundle options) {
final Bundle mergedBundle = new Bundle();
mergedBundle.putAll(options);
final Bundle activityOptionsBundle = getActivityOptionsBundle();
if (activityOptionsBundle != null) {
mergedBundle.putAll(activityOptionsBundle);
}
return mergedBundle;
}
public interface CategoryListener { public interface CategoryListener {
/** /**
* @param categories the changed categories that have to be refreshed, or null to force * @param categories the changed categories that have to be refreshed, or null to force