diff options
author | Bryce Lee <brycelee@google.com> | 2015-05-02 01:22:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-02 01:22:24 +0000 |
commit | 13428b5079e5b0c53efb2e5188f542fab1a7f91c (patch) | |
tree | f3890fbd2b96bc98692bf8d49b83f5be057027c3 /services/core/java/com/android/server/wm | |
parent | c2180dd5168af07ef18bafb629c25ea2f3b42138 (diff) | |
parent | f626c679fdd7e44c6cf0eb2d2f6be786636a90bc (diff) | |
download | frameworks_base-13428b5079e5b0c53efb2e5188f542fab1a7f91c.zip frameworks_base-13428b5079e5b0c53efb2e5188f542fab1a7f91c.tar.gz frameworks_base-13428b5079e5b0c53efb2e5188f542fab1a7f91c.tar.bz2 |
am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev
* commit 'f626c679fdd7e44c6cf0eb2d2f6be786636a90bc':
Add configuration to allow animations during low power mode.
Diffstat (limited to 'services/core/java/com/android/server/wm')
-rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index d4b3dab..6bf68e8 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -332,6 +332,7 @@ public class WindowManagerService extends IWindowManager.Stub final boolean mHasPermanentDpad; final long mDrawLockTimeoutMillis; + final boolean mAllowAnimationsInLowPowerMode; final boolean mAllowBootMessages; @@ -899,6 +900,8 @@ public class WindowManagerService extends IWindowManager.Stub com.android.internal.R.bool.config_defaultInTouchMode); mDrawLockTimeoutMillis = context.getResources().getInteger( com.android.internal.R.integer.config_drawLockTimeoutMillis); + mAllowAnimationsInLowPowerMode = context.getResources().getBoolean( + com.android.internal.R.bool.config_allowAnimationsInLowPowerMode); mInputManager = inputManager; // Must be before createDisplayContentLocked. mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class); mDisplaySettings = new DisplaySettings(); @@ -924,7 +927,7 @@ public class WindowManagerService extends IWindowManager.Stub @Override public void onLowPowerModeChanged(boolean enabled) { synchronized (mWindowMap) { - if (mAnimationsDisabled != enabled) { + if (mAnimationsDisabled != enabled && !mAllowAnimationsInLowPowerMode) { mAnimationsDisabled = enabled; dispatchNewAnimatorScaleLocked(null); } |