Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a13b4da6: Merge "Fix initial brightness state after startup." into jb-dev

Browse Source 
* commit 'a13b4da68d8df0977c8dec5001de7c9ecea71d9e':
  Fix initial brightness state after startup.
This commit is contained in:
Craig Mautner
2012-05-31 13:09:48 -07:00
committed by Android Git Automerger
parent 39b79e79d3 a13b4da68d
commit c3dfaf8d58
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/PowerManagerService.java
View File

@@ -2242,7 +2242,9 @@ public class PowerManagerService extends IPowerManager.Stub
} else { } else {
newValue = endValue; newValue = endValue;
mHighestLightSensorValue = endSensorValue; mHighestLightSensorValue = endSensorValue;
mInitialAnimation = false; if (endValue > 0) {
mInitialAnimation = false;
}
} }
if (mDebugLightAnimation) { if (mDebugLightAnimation) {
@@ -2290,7 +2292,7 @@ public class PowerManagerService extends IPowerManager.Stub
currentMask = mask; currentMask = mask;
duration = (int) (mWindowScaleAnimation * animationDuration); duration = (int) (mWindowScaleAnimation * animationDuration);
startTimeMillis = SystemClock.elapsedRealtime(); startTimeMillis = SystemClock.elapsedRealtime();
mInitialAnimation = currentValue == 0 && target > 0; mInitialAnimation = mInitialAnimation && target > 0;
if (mDebugLightAnimation) { if (mDebugLightAnimation) {
Slog.v(TAG, "animateTo(target=" + target 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) { private void dockStateChanged(int state) {
synchronized (mLocks) { synchronized (mLocks) {