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

Commit b96b2cc5 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... 

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

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



Change-Id: I89a68a4a604e17834f31b1c15c38be9b2cc86e24
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b50cf2b2 0eab53df

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);

            }