diff options
author | Bryce Lee <brycelee@google.com> | 2015-04-30 19:44:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 19:44:49 +0000 |
commit | a7f07fc35ba647465503fe0cba3d4521b68d89c1 (patch) | |
tree | e838578c6c4c37294aefeae604805ba5494999c8 /services | |
parent | 4e3a91937baaf34ad409fc3770c3039b9fcc7232 (diff) | |
parent | 023de22cf2486f6c51b789c762439b6b1f026085 (diff) | |
download | frameworks_base-a7f07fc35ba647465503fe0cba3d4521b68d89c1.zip frameworks_base-a7f07fc35ba647465503fe0cba3d4521b68d89c1.tar.gz frameworks_base-a7f07fc35ba647465503fe0cba3d4521b68d89c1.tar.bz2 |
Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev
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 0cda6fd..ad6aa75 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; @@ -831,6 +832,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(); @@ -856,7 +859,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); } |