drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d376d240: Merge change I081f08c1 into eclair

Browse Source 
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-plus-aosp

* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
  A better solution for ignoring user activity while the screen is animating off.
This commit is contained in:
Mike Lockwood
2009-10-28 05:55:22 -07:00
committed by Android Git Automerger
parent e36f5af3ad d376d2407b
commit 69dfa62308
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,6 @@ class PowerManagerService extends IPowerManager.Stub
private int mProximityCount = 0;
private int mPowerState;
private boolean mOffBecauseOfUser;
private boolean mAnimatingScreenOff;
private int mUserState;
private boolean mKeyboardVisible = false;
private boolean mUserActivityAllowed = true;
@ -1232,7 +1231,6 @@ class PowerManagerService extends IPowerManager.Stub
Log.d(TAG,
"preventScreenOn: turning on after a prior preventScreenOn(true)!");
}
mAnimatingScreenOff = false;
int err = setScreenStateLocked(true);
if (err != 0) {
Log.w(TAG, "preventScreenOn: error from setScreenStateLocked(): " + err);
@ -1394,7 +1392,6 @@ class PowerManagerService extends IPowerManager.Stub
reallyTurnScreenOn = false;
}
if (reallyTurnScreenOn) {
mAnimatingScreenOff = false;
err = setScreenStateLocked(true);
long identity = Binder.clearCallingIdentity();
try {
@ -1436,7 +1433,6 @@ class PowerManagerService extends IPowerManager.Stub
if (!mScreenBrightness.animating) {
err = screenOffFinishedAnimatingLocked(becauseOfUser);
} else {
mAnimatingScreenOff = true;
mOffBecauseOfUser = becauseOfUser;
err = 0;
mLastTouchDown = 0;
@ -1454,7 +1450,6 @@ class PowerManagerService extends IPowerManager.Stub
mTotalTouchDownTime, mTouchCycles);
mLastTouchDown = 0;
int err = setScreenStateLocked(false);
mAnimatingScreenOff = false;
if (mScreenOnStartTime != 0) {
mScreenOnTime += SystemClock.elapsedRealtime() - mScreenOnStartTime;
mScreenOnStartTime = 0;
@ -1827,9 +1822,6 @@ class PowerManagerService extends IPowerManager.Stub
return;
}
if (mAnimatingScreenOff) {
return;
}
if (false) {
if (((mPokey & POKE_LOCK_IGNORE_CHEEK_EVENTS) != 0)) {
Log.d(TAG, "userActivity !!!");//, new RuntimeException());
@ -1847,6 +1839,11 @@ class PowerManagerService extends IPowerManager.Stub
+ " mProximitySensorActive=" + mProximitySensorActive
+ " force=" + force);
}
// ignore user activity if we are in the process of turning off the screen
if (mScreenBrightness.animating && mScreenBrightness.targetValue == 0) {
Log.d(TAG, "ignoring user activity while turning off screen");
return;
}
if (mLastEventTime <= time || force) {
mLastEventTime = time;
if ((mUserActivityAllowed && !mProximitySensorActive) || force) {