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

Commit bfc4fff7 authored by Todd Lee's avatar Todd Lee Committed by Android (Google) Code Review
Browse files

Merge "Enable OEM config for cross-task scale up transitions" into main

parents 5f08de80 c37d9974

core/java/android/app/ActivityOptions.java

+10 −0
Original line number Diff line number Diff line
@@ -2230,6 +2230,16 @@ public class ActivityOptions extends ComponentOptions { 
        return mLaunchCookie;

    }



    /**

     * Set the ability for the current transition/animation to work cross-task.

     * @param allowTaskOverride true to allow cross-task use, otherwise false.

     *

     * @hide

     */

    public ActivityOptions setOverrideTaskTransition(boolean allowTaskOverride) {

        this.mOverrideTaskTransition = allowTaskOverride;

        return this;

    }



    /** @hide */

    public boolean getOverrideTaskTransition() {

core/java/android/window/TransitionInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -1291,12 +1291,13 @@ public final class TransitionInfo implements Parcelable { 
            return options;

        }



        /** Make options for a scale-up animation. */

        /** Make options for a scale-up animation with task override option */

        @NonNull

        public static AnimationOptions makeScaleUpAnimOptions(int startX, int startY, int width,

                int height) {

                int height, boolean overrideTaskTransition) {

            AnimationOptions options = new AnimationOptions(ANIM_SCALE_UP);

            options.mTransitionBounds.set(startX, startY, startX + width, startY + height);

            options.mOverrideTaskTransition = overrideTaskTransition;

            return options;

        }

core/res/res/values-watch/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -110,4 +110,8 @@ 
            tap power gesture from triggering the selected target action.

    -->

    <integer name="config_doubleTapPowerGestureMode">0</integer>



    <!-- By default ActivityOptions#makeScaleUpAnimation is only used between activities. This

     config enables OEMs to support its usage across tasks.-->

    <bool name="config_enableCrossTaskScaleUpAnimation">true</bool>

</resources>

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -7348,4 +7348,8 @@ 
    <!-- Array containing the notification assistant service adjustments that are not supported by

     default on this device-->

    <string-array translatable="false" name="config_notificationDefaultUnsupportedAdjustments" />



    <!-- By default ActivityOptions#makeScaleUpAnimation is only used between activities. This

         config enables OEMs to support its usage across tasks.-->

    <bool name="config_enableCrossTaskScaleUpAnimation">false</bool>

</resources>

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -5902,4 +5902,8 @@ 
  <java-symbol type="string" name="usb_apm_usb_plugged_in_when_locked_notification_text" />

  <java-symbol type="string" name="usb_apm_usb_suspicious_activity_notification_title" />

  <java-symbol type="string" name="usb_apm_usb_suspicious_activity_notification_text" />



  <!-- Enable OEMs to support scale up anim across tasks.-->

  <java-symbol type="bool" name="config_enableCrossTaskScaleUpAnimation" />



</resources>