diff options
author | Bryce Lee <brycelee@google.com> | 2014-11-10 13:33:28 -0800 |
---|---|---|
committer | Bryce Lee <brycelee@google.com> | 2014-11-10 13:33:28 -0800 |
commit | 812d7025d2d17b540b1c8d233dab1176d8c34fa7 (patch) | |
tree | 6e0dd63456c90cdac8e7cad9ab8dcf5079ac9e83 /policy/src | |
parent | 88d12e5f7bdd85323aacacffb6950a336132df67 (diff) | |
download | frameworks_base-812d7025d2d17b540b1c8d233dab1176d8c34fa7.zip frameworks_base-812d7025d2d17b540b1c8d233dab1176d8c34fa7.tar.gz frameworks_base-812d7025d2d17b540b1c8d233dab1176d8c34fa7.tar.bz2 |
Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
Bug: 18297399
Change-Id: I5a520e8bf861e46d61e54d7d0849e55b2e5d9239
Diffstat (limited to 'policy/src')
-rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 2ea1802..ddefb1f 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -522,6 +522,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { private boolean mAllowTheaterModeWakeFromKey; private boolean mAllowTheaterModeWakeFromPowerKey; private boolean mAllowTheaterModeWakeFromMotion; + private boolean mAllowTheaterModeWakeFromMotionWhenNotDreaming; private boolean mAllowTheaterModeWakeFromCameraLens; private boolean mAllowTheaterModeWakeFromLidSwitch; private boolean mAllowTheaterModeWakeFromWakeGesture; @@ -1232,6 +1233,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { com.android.internal.R.bool.config_allowTheaterModeWakeFromPowerKey); mAllowTheaterModeWakeFromMotion = mContext.getResources().getBoolean( com.android.internal.R.bool.config_allowTheaterModeWakeFromMotion); + mAllowTheaterModeWakeFromMotionWhenNotDreaming = mContext.getResources().getBoolean( + com.android.internal.R.bool.config_allowTheaterModeWakeFromMotionWhenNotDreaming); mAllowTheaterModeWakeFromCameraLens = mContext.getResources().getBoolean( com.android.internal.R.bool.config_allowTheaterModeWakeFromCameraLens); mAllowTheaterModeWakeFromLidSwitch = mContext.getResources().getBoolean( @@ -4785,6 +4788,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { return ACTION_PASS_TO_USER; } + // If we have not passed the action up and we are in theater mode without dreaming, + // there will be no dream to intercept the touch and wake into ambient. The device should + // wake up in this case. + if (isTheaterModeEnabled() && (policyFlags & FLAG_WAKE) != 0) { + wakeUp(whenNanos / 1000000, mAllowTheaterModeWakeFromMotionWhenNotDreaming); + } + return 0; } |