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

Commit 2d6f7667 authored by Annie Lin's avatar Annie Lin Committed by Android (Google) Code Review
Browse files

Merge "Add ANIM_FROM_STYLE to the list of animations that the default Shell... 

Merge "Add ANIM_FROM_STYLE to the list of animations that the default Shell transition handler can run." into main
parents aae1a013 dba1f04a

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.wm.shell.transition; 
import static android.app.ActivityOptions.ANIM_CLIP_REVEAL;

import static android.app.ActivityOptions.ANIM_CUSTOM;

import static android.app.ActivityOptions.ANIM_NONE;

import static android.app.ActivityOptions.ANIM_FROM_STYLE;

import static android.app.ActivityOptions.ANIM_OPEN_CROSS_PROFILE_APPS;

import static android.app.ActivityOptions.ANIM_SCALE_UP;

import static android.app.ActivityOptions.ANIM_SCENE_TRANSITION;
@@ -985,7 +986,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
        final int animType = options.getType();

        return animType == ANIM_CUSTOM || animType == ANIM_SCALE_UP

                || animType == ANIM_THUMBNAIL_SCALE_UP || animType == ANIM_THUMBNAIL_SCALE_DOWN

                || animType == ANIM_CLIP_REVEAL || animType == ANIM_OPEN_CROSS_PROFILE_APPS;

                || animType == ANIM_CLIP_REVEAL || animType == ANIM_OPEN_CROSS_PROFILE_APPS

                || animType == ANIM_FROM_STYLE;

    }



    private static void applyTransformation(long time, SurfaceControl.Transaction t,