Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc9f69cc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Merge existing bundle with ActivityOptions" into sc-dev am: a83514ec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455597

Change-Id: I39352ac391acf93f8f1e5a4b84cd3f3a52b01420
parents 719bf0c0 a83514ec

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

+20 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ public abstract class SettingsTransitionActivity extends FragmentActivity { 
            super.startActivity(intent, options);

            return;

        }

        if (options != null) {

            super.startActivity(intent, getMergedBundleForTransition(options));

            return;

        }

        super.startActivity(intent, getActivityOptionsBundle(toolbar));

    }
@@ -110,6 +114,11 @@ public abstract class SettingsTransitionActivity extends FragmentActivity { 
            super.startActivityForResult(intent, requestCode, options);

            return;

        }

        if (options != null) {

            super.startActivityForResult(intent, requestCode,

                    getMergedBundleForTransition(options));

            return;

        }

        super.startActivityForResult(intent, requestCode, getActivityOptionsBundle(toolbar));

    }
@@ -133,4 +142,15 @@ public abstract class SettingsTransitionActivity extends FragmentActivity { 
        return ActivityOptions.makeSceneTransitionAnimation(this, toolbar,

                "shared_element_view").toBundle();

    }



    private Bundle getMergedBundleForTransition(@NonNull Bundle options) {

        final Toolbar toolbar = getToolbar();

        final Bundle mergedBundle = new Bundle();

        mergedBundle.putAll(options);

        final Bundle activityOptionsBundle = getActivityOptionsBundle(toolbar);

        if (activityOptionsBundle != null) {

            mergedBundle.putAll(activityOptionsBundle);

        }

        return mergedBundle;

    }

}