From e5b44043f75bab47955652b5bd98502ce2294f37 Mon Sep 17 00:00:00 2001 From: Chet Haase Date: Tue, 13 Jun 2017 07:15:46 -0700 Subject: [PATCH] Make --no-window-animation flag apply to animators, too There is a flag for 'adb shell am instrument' that disables animations, which is useful for testing (if you want to, for example, disable animations to speed up tests or remove animation-caused side-effects as a factor). But only the pre-honeycomb animations (window transitions and window animations) were listening to this flag. This change makes animators listen as well, so all three duration scale settings are affected. Bug: 32072407 --no_window_animation ADB arg should set all animation scales to 0.0f Test: manual. Ran frameworks APCT tests with --no_window_animation and verified that all three types of animations had their duration scales set to 0 for the duration of the tests. Change-Id: I5ae4a60faa714c9534dfae58d1efcd54f577d82b --- cmds/am/src/com/android/commands/am/Instrument.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cmds/am/src/com/android/commands/am/Instrument.java b/cmds/am/src/com/android/commands/am/Instrument.java index 8eefd256a69d..4966b4380d9b 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 @@ 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. -- 2.11.0