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

Commit 34580bd9 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Don't do any animations for unstyled translucent activities" into udc-dev am: 2f9daf61 

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



Change-Id: I33595910d032b48dfe2ece2394bad381f755bfdf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef8ad682 2f9daf61

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

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.view.WindowManager.TRANSIT_OPEN; 
import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;

import static android.view.WindowManager.transitTypeToString;

import static android.window.TransitionInfo.FLAGS_IS_NON_APP_WINDOW;

import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;

import static android.window.TransitionInfo.FLAG_TRANSLUCENT;
@@ -150,6 +151,10 @@ public class TransitionAnimationHelper { 
                            .loadAnimationAttr(options.getPackageName(), options.getAnimations(),

                                    animAttr, translucent);

                }

            } else if (translucent && !isTask && ((changeFlags & FLAGS_IS_NON_APP_WINDOW) == 0)) {

                // Un-styled translucent activities technically have undefined animations; however,

                // as is always the case, some apps now rely on this being no-animation, so skip

                // loading animations here.

            } else {

                a = transitionAnimation.loadDefaultAnimationAttr(animAttr, translucent);

            }