diff options
| author | Giulio Cervera <giulio.cervera@gmail.com> | 2011-11-03 02:42:04 +0100 |
|---|---|---|
| committer | Giulio Cervera <giulio.cervera@gmail.com> | 2011-11-03 12:58:50 +0100 |
| commit | 22a12317dd69ebab14b0e144382186a0a9caea12 (patch) | |
| tree | 1e3a1dafb6a6c587938e1f484e65f99cba232990 | |
| parent | 88f2bb876c6049fdf826acb0a5009180e8c1f21a (diff) | |
| download | frameworks_base-22a12317dd69ebab14b0e144382186a0a9caea12.zip frameworks_base-22a12317dd69ebab14b0e144382186a0a9caea12.tar.gz frameworks_base-22a12317dd69ebab14b0e144382186a0a9caea12.tar.bz2 | |
Config option to completly disable Electron Beam animation
Change-Id: Ia9c5049d8154f6c14037880481caef7073d7016f
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 19 |
2 files changed, 14 insertions, 8 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index bf560c7..0cff845 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -391,6 +391,9 @@ <!-- Allows the light sensor to be ignored when flashlight is on --> <bool name="config_flashlight_affects_lightsensor">false</bool> + <!-- Enable the screen animation --> + <bool name="config_enableScreenAnimation">true</bool> + <!-- Enable the screen-on animation --> <bool name="config_enableScreenOnAnimation">false</bool> diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 58186a6..83aea6b 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -515,14 +515,17 @@ class PowerManagerService extends IPowerManager.Stub // recalculate everything setScreenOffTimeoutsLocked(); - mElectronBeamAnimationOn = Settings.System.getInt(mContext.getContentResolver(), - 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, - mContext.getResources().getBoolean( - com.android.internal.R.bool.config_enableScreenOffAnimation) ? 1 : 0) == 1; + if (mContext.getResources().getBoolean( + com.android.internal.R.bool.config_enableScreenAnimation)) { + mElectronBeamAnimationOn = Settings.System.getInt(mContext.getContentResolver(), + 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, + mContext.getResources().getBoolean( + com.android.internal.R.bool.config_enableScreenOffAnimation) ? 1 : 0) == 1; + } mAnimationSetting = 0; if (mElectronBeamAnimationOff) { |