commit c36e3e7fff392495360f3ac2f123f693728a958b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 19 23:29:04 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 19 23:29:10 2017 +0000
tree a6774c4a6aea7ddc0e69004c0f5020398b142b3e
parent 113918f3093aa498b6b992accd1c5c0baeed14fb
parent e5b44043f75bab47955652b5bd98502ce2294f37

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

cmds/am/src/com/android/commands/am/Instrument.java

diff --git a/cmds/am/src/com/android/commands/am/Instrument.java b/cmds/am/src/com/android/commands/am/Instrument.java
index 8eefd25..4966b43 100644
--- a/cmds/am/src/com/android/commands/am/Instrument.java
+++ b/cmds/am/src/com/android/commands/am/Instrument.java
@@ -382,6 +382,7 @@
                 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.