diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-31 13:09:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-31 13:09:48 -0700 |
| commit | c3dfaf8d587d3ea4ffd62377ec6041ad70fc152a (patch) | |
| tree | b0f23ea921e417ac88af12c484bf85405b59c903 /services | |
| parent | 39b79e79d3ad9e98a9c76c1b104599be494213f6 (diff) | |
| parent | a13b4da68d8df0977c8dec5001de7c9ecea71d9e (diff) | |
| download | frameworks_base-c3dfaf8d587d3ea4ffd62377ec6041ad70fc152a.zip frameworks_base-c3dfaf8d587d3ea4ffd62377ec6041ad70fc152a.tar.gz frameworks_base-c3dfaf8d587d3ea4ffd62377ec6041ad70fc152a.tar.bz2 | |
am a13b4da6: Merge "Fix initial brightness state after startup." into jb-dev
* commit 'a13b4da68d8df0977c8dec5001de7c9ecea71d9e':
Fix initial brightness state after startup.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 38e08ae..469b4f1 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2242,7 +2242,9 @@ public class PowerManagerService extends IPowerManager.Stub } else { newValue = endValue; mHighestLightSensorValue = endSensorValue; - mInitialAnimation = false; + if (endValue > 0) { + mInitialAnimation = false; + } } if (mDebugLightAnimation) { @@ -2290,7 +2292,7 @@ public class PowerManagerService extends IPowerManager.Stub currentMask = mask; duration = (int) (mWindowScaleAnimation * animationDuration); startTimeMillis = SystemClock.elapsedRealtime(); - mInitialAnimation = currentValue == 0 && target > 0; + mInitialAnimation = mInitialAnimation && target > 0; if (mDebugLightAnimation) { Slog.v(TAG, "animateTo(target=" + target @@ -2608,7 +2610,8 @@ public class PowerManagerService extends IPowerManager.Stub } }; - private boolean mInitialAnimation; // used to prevent lightsensor changes while turning on + /** used to prevent lightsensor changes while turning on. */ + private boolean mInitialAnimation = true; private void dockStateChanged(int state) { synchronized (mLocks) { |