diff options
author | Bryce Lee <brycelee@google.com> | 2015-04-30 20:01:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 20:01:02 +0000 |
commit | f626c679fdd7e44c6cf0eb2d2f6be786636a90bc (patch) | |
tree | 8d536d4966ee76190a3d56791d6f21d79ae9b4d1 /services | |
parent | 31e493277ada5dc72e6b0bf501fa649307bf6814 (diff) | |
parent | a7f07fc35ba647465503fe0cba3d4521b68d89c1 (diff) | |
download | frameworks_base-f626c679fdd7e44c6cf0eb2d2f6be786636a90bc.zip frameworks_base-f626c679fdd7e44c6cf0eb2d2f6be786636a90bc.tar.gz frameworks_base-f626c679fdd7e44c6cf0eb2d2f6be786636a90bc.tar.bz2 |
am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev
* commit 'a7f07fc35ba647465503fe0cba3d4521b68d89c1':
Add configuration to allow animations during low power mode.
Diffstat (limited to 'services')
-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 aef9067..e9df96b 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -340,6 +340,7 @@ public class WindowManagerService extends IWindowManager.Stub final boolean mHasPermanentDpad; final long mDrawLockTimeoutMillis; + final boolean mAllowAnimationsInLowPowerMode; final boolean mAllowBootMessages; @@ -844,6 +845,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(); @@ -869,7 +872,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); } |