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

Commit 87b6d2db authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "power: Fix power animation toggles" into gingerbread

parents 9fc4d4ca 0fbe37c1

core/res/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -381,4 +381,10 @@ 
    <!-- Allows the light sensor to be ignored when flashlight is on -->

    <bool name="config_flashlight_affects_lightsensor">false</bool>



    <!-- Enable the screen-on animation -->

    <bool name="config_enableScreenOnAnimation">false</bool>



    <!-- Enable the screen-off animation -->

    <bool name="config_enableScreenOffAnimation">true</bool>



</resources>

services/java/com/android/server/PowerManagerService.java

+11 −3
Original line number Diff line number Diff line
@@ -508,9 +508,13 @@ class PowerManagerService extends IPowerManager.Stub 
                setScreenOffTimeoutsLocked();



                mElectronBeamAnimationOn = Settings.System.getInt(mContext.getContentResolver(),

                                                          ELECTRON_BEAM_ANIMATION_ON, 0) == 1;

                            ELECTRON_BEAM_ANIMATION_ON,

                            mContext.getResources().getBoolean(

                                    com.android.internal.R.bool.config_enableScreenOnAnimation) ? 1 : 0) == 1;

                mElectronBeamAnimationOff = Settings.System.getInt(mContext.getContentResolver(),

                                                          ELECTRON_BEAM_ANIMATION_OFF, 1) == 1;

                            ELECTRON_BEAM_ANIMATION_OFF,

                            mContext.getResources().getBoolean(

                                    com.android.internal.R.bool.config_enableScreenOffAnimation) ? 1 : 0) == 1;



                final float windowScale = getFloat(WINDOW_ANIMATION_SCALE, 1.0f);

                final float transitionScale = getFloat(TRANSITION_ANIMATION_SCALE, 1.0f);
@@ -2112,7 +2116,11 @@ class PowerManagerService extends IPowerManager.Stub 
        }



        public void run() {

            if (mAnimateScreenLights) {

            if (mAnimateScreenLights ||

                    (!mAnimateScreenLights && Settings.System.getInt(mContext.getContentResolver(),

                            ELECTRON_BEAM_ANIMATION_OFF,

                            mContext.getResources().getBoolean(

                                    com.android.internal.R.bool.config_enableScreenOffAnimation) ? 1 : 0) == 0)) {

                synchronized (mLocks) {

                    long now = SystemClock.uptimeMillis();

                    boolean more = mScreenBrightness.stepLocked();