diff options
| author | Giulio Cervera <giulio.cervera@gmail.com> | 2011-11-14 03:00:05 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2011-11-14 03:00:05 +0300 |
| commit | 7c7fad0556bc3ccdaf2a75f8b1989f73dc497074 (patch) | |
| tree | 3abd1ef6106bbfd0d0195ef299e246ef6397561a /services | |
| parent | c0c9f2328817d2cbe8fc9f17d9eef56d6edfbb16 (diff) | |
| parent | 22a12317dd69ebab14b0e144382186a0a9caea12 (diff) | |
| download | frameworks_base-7c7fad0556bc3ccdaf2a75f8b1989f73dc497074.zip frameworks_base-7c7fad0556bc3ccdaf2a75f8b1989f73dc497074.tar.gz frameworks_base-7c7fad0556bc3ccdaf2a75f8b1989f73dc497074.tar.bz2 | |
Merge "Config option to completly disable Electron Beam animation" into gingerbread
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 19 |
1 files changed, 11 insertions, 8 deletions
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) { |