diff options
| author | Bryce Lee <brycelee@google.com> | 2014-11-12 03:19:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-12 03:19:50 +0000 |
| commit | 358d19065b0e32ee4d48f26477cf917856e46359 (patch) | |
| tree | 10b18c87335df8e8bac3440b764f8e0de90d0147 /policy | |
| parent | d7b557fb288c911bffd06f24923f16cc0e80153e (diff) | |
| parent | 70532bf46433519a27ecada265b6de9364f51f39 (diff) | |
| download | frameworks_base-358d19065b0e32ee4d48f26477cf917856e46359.zip frameworks_base-358d19065b0e32ee4d48f26477cf917856e46359.tar.gz frameworks_base-358d19065b0e32ee4d48f26477cf917856e46359.tar.bz2 | |
Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev automerge: 68f9773 automerge: 5c14bc2
automerge: 70532bf
* commit '70532bf46433519a27ecada265b6de9364f51f39':
Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
Diffstat (limited to 'policy')
| -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 f1d1ae5..1ead800 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -525,6 +525,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; @@ -1235,6 +1236,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( @@ -4782,6 +4785,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; } |