Merge "Don't do any animations for unstyled translucent activities" into udc-dev
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user