drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev

Browse Source
This commit is contained in:
Bryce Lee
2015-04-30 19:44:45 +00:00
committed by Android (Google) Code Review
parent 4e3a91937b 023de22cf2
commit a7f07fc35b
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@ -2102,4 +2102,7 @@
<!-- This config is used to force VoiceInteractionService to start on certain low ram devices. --> <!-- This config is used to force VoiceInteractionService to start on certain low ram devices. -->
<bool name="config_forceEnableVoiceInteractionService">false</bool> <bool name="config_forceEnableVoiceInteractionService">false</bool>
<!-- This config is ued to determine whether animations are allowed in low power mode. -->
<bool name="config_allowAnimationsInLowPowerMode">false</bool>
</resources> </resources>

1
core/res/res/values/symbols.xml
View File

@ -282,6 +282,7 @@
<java-symbol type="bool" name="config_bluetooth_default_profiles" /> <java-symbol type="bool" name="config_bluetooth_default_profiles" />
<java-symbol type="bool" name="config_enableWifiDisplay" /> <java-symbol type="bool" name="config_enableWifiDisplay" />
<java-symbol type="bool" name="config_forceEnableVoiceInteractionService" /> <java-symbol type="bool" name="config_forceEnableVoiceInteractionService" />
<java-symbol type="bool" name="config_allowAnimationsInLowPowerMode" />
<java-symbol type="bool" name="config_useDevInputEventForAudioJack" /> <java-symbol type="bool" name="config_useDevInputEventForAudioJack" />
<java-symbol type="bool" name="config_safe_media_volume_enabled" /> <java-symbol type="bool" name="config_safe_media_volume_enabled" />
<java-symbol type="bool" name="config_camera_sound_forced" /> <java-symbol type="bool" name="config_camera_sound_forced" />

5
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@ -340,6 +340,7 @@ public class WindowManagerService extends IWindowManager.Stub
final boolean mHasPermanentDpad; final boolean mHasPermanentDpad;
final long mDrawLockTimeoutMillis; final long mDrawLockTimeoutMillis;
final boolean mAllowAnimationsInLowPowerMode;
final boolean mAllowBootMessages; final boolean mAllowBootMessages;
@ -831,6 +832,8 @@ public class WindowManagerService extends IWindowManager.Stub
com.android.internal.R.bool.config_defaultInTouchMode); com.android.internal.R.bool.config_defaultInTouchMode);
mDrawLockTimeoutMillis = context.getResources().getInteger( mDrawLockTimeoutMillis = context.getResources().getInteger(
com.android.internal.R.integer.config_drawLockTimeoutMillis); com.android.internal.R.integer.config_drawLockTimeoutMillis);
mAllowAnimationsInLowPowerMode = context.getResources().getBoolean(
com.android.internal.R.bool.config_allowAnimationsInLowPowerMode);
mInputManager = inputManager; // Must be before createDisplayContentLocked. mInputManager = inputManager; // Must be before createDisplayContentLocked.
mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class); mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);
mDisplaySettings = new DisplaySettings(); mDisplaySettings = new DisplaySettings();
@ -856,7 +859,7 @@ public class WindowManagerService extends IWindowManager.Stub
@Override @Override
public void onLowPowerModeChanged(boolean enabled) { public void onLowPowerModeChanged(boolean enabled) {
synchronized (mWindowMap) { synchronized (mWindowMap) {
if (mAnimationsDisabled != enabled) { if (mAnimationsDisabled != enabled && !mAllowAnimationsInLowPowerMode) {
mAnimationsDisabled = enabled; mAnimationsDisabled = enabled;
dispatchNewAnimatorScaleLocked(null); dispatchNewAnimatorScaleLocked(null);
} }