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

am e15c0bd3: am 52e3b17e: am c6e1493f: Restore short screen timeout when keyguard is unhidden.

Browse Source 
Merge commit 'e15c0bd374571b3dc059481710c4c8211e81dede'

* commit 'e15c0bd374571b3dc059481710c4c8211e81dede':
  Restore short screen timeout when keyguard is unhidden.
This commit is contained in:
Mike Lockwood
2009-11-10 07:19:46 -08:00
committed by Android Git Automerger
parent 714fab8ece 77cdc55761
commit f9a9dccc37
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@@ -424,6 +424,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
* Notify us when the keyguard is hidden by another window
*/
public void setHidden(boolean isHidden) {
if (DEBUG) Log.d(TAG, "setHidden " + isHidden);
synchronized (KeyguardViewMediator.this) {
mHidden = isHidden;
adjustUserActivityLocked();
@@ -904,7 +905,13 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
private void adjustUserActivityLocked() {
// disable user activity if we are shown and not hidden
mRealPowerManager.enableUserActivity(!mShowing || mHidden);
if (DEBUG) Log.d(TAG, "adjustUserActivityLocked mShowing: " + mShowing + " mHidden: " + mHidden);
boolean enabled = !mShowing || mHidden;
mRealPowerManager.enableUserActivity(enabled);
if (!enabled && mScreenOn) {
// reinstate our short screen timeout policy
pokeWakelock();
}
}
/**