Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f626c679 authored by Bryce Lee's avatar Bryce Lee Committed by Android Git Automerger
Browse files

am a7f07fc3: Merge "Add configuration to allow animations during low power... 

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

* commit 'a7f07fc3':
  Add configuration to allow animations during low power mode.
parents 31e49327 a7f07fc3

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2102,4 +2102,7 @@ 


    <!-- This config is used to force VoiceInteractionService to start on certain low ram devices. -->

    <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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ 
  <java-symbol type="bool" name="config_bluetooth_default_profiles" />

  <java-symbol type="bool" name="config_enableWifiDisplay" />

  <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_safe_media_volume_enabled" />

  <java-symbol type="bool" name="config_camera_sound_forced" />

services/core/java/com/android/server/wm/WindowManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

                    }