Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Rosky
2023-05-25 16:00:18 +00:00
committed by Android (Google) Code Review
parent 23d433f623 eb7d276880
commit 2f9daf6127
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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_BACK;
import static android.view.WindowManager.TRANSIT_TO_FRONT; import static android.view.WindowManager.TRANSIT_TO_FRONT;
import static android.view.WindowManager.transitTypeToString; 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_STARTING_WINDOW_TRANSFER_RECIPIENT;
import static android.window.TransitionInfo.FLAG_TRANSLUCENT; import static android.window.TransitionInfo.FLAG_TRANSLUCENT;
@@ -150,6 +151,10 @@ public class TransitionAnimationHelper {
.loadAnimationAttr(options.getPackageName(), options.getAnimations(), .loadAnimationAttr(options.getPackageName(), options.getAnimations(),
animAttr, translucent); 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 { } else {
a = transitionAnimation.loadDefaultAnimationAttr(animAttr, translucent); a = transitionAnimation.loadDefaultAnimationAttr(animAttr, translucent);
} }