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

am: c36e3e7fff Change-Id: Ic680329647398f52a0d28633aa209e37556c1e31
2017-06-19 23:39:58 +00:00
parent f4dc128aa2 c36e3e7fff
commit 972734f592
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.