Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff

am: 97f7dbb004 Change-Id: I8ad8f455a430b7230f9f83dc5b0967db4a540e87
2017-06-19 23:46:53 +00:00
parent 1947c0a8fb 97f7dbb004
commit 5e3d39aae4
1 changed files with 1 additions and 0 deletions
--- a/cmds/am/src/com/android/commands/am/Instrument.java
+++ b/cmds/am/src/com/android/commands/am/Instrument.java
@@ -382,6 +382,7 @@ public class Instrument {
                oldAnims = mWm.getAnimationScales();
                mWm.setAnimationScale(0, 0.0f);
                mWm.setAnimationScale(1, 0.0f);
+                mWm.setAnimationScale(2, 0.0f);
            }

            // Figure out which component we are tring to do.