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

Commit 28602c09 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'chooser' into oc-dev 

* changes:
  Rely on view animations for ResolverActivity
  Create a valid ActivityOptions Bundle even for default animations
  Remove scale up animation for startActivity from RemoteViews
parents 904e6cad 146c01da

core/java/android/app/ActivityOptions.java

+0 −3
Original line number Diff line number Diff line
@@ -1211,9 +1211,6 @@ public class ActivityOptions { 
     * methods that take an options Bundle.

     */

    public Bundle toBundle() {

        if (mAnimationType == ANIM_DEFAULT) {

            return null;

        }

        Bundle b = new Bundle();

        if (mPackageName != null) {

            b.putString(KEY_PACKAGE_NAME, mPackageName);

core/java/android/widget/RemoteViews.java

+1 −3
Original line number Diff line number Diff line
@@ -252,9 +252,7 @@ public class RemoteViews implements Parcelable, Filter { 
                if (mEnterAnimationId != 0) {

                    opts = ActivityOptions.makeCustomAnimation(context, mEnterAnimationId, 0);

                } else {

                    opts = ActivityOptions.makeScaleUpAnimation(view,

                            0, 0,

                            view.getMeasuredWidth(), view.getMeasuredHeight());

                    opts = ActivityOptions.makeBasic();

                }



                if (launchStackId != StackId.INVALID_STACK_ID) {

core/res/res/values/themes_device_defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -794,6 +794,8 @@ easier. 


    <!-- Theme used for the intent picker activity. -->

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.Material.Light">

        <item name="windowEnterTransition">@empty</item>

        <item name="windowExitTransition">@empty</item>

        <item name="windowIsTranslucent">true</item>

        <item name="windowNoTitle">true</item>

        <item name="windowBackground">@color/transparent</item>