diff options
| author | Bryce Lee <brycelee@google.com> | 2014-11-05 19:06:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-05 19:06:31 +0000 |
| commit | 4947ff462795ae9927b98fa2346634af5bbbf7c4 (patch) | |
| tree | b0d65c62e495433e16f7309438fb116e7d640466 /policy/src | |
| parent | 8d37f7c1b28c4e82b3bc961d183c313db16d8333 (diff) | |
| parent | 1ae5dc12d0013835ed5c567b6e8ca3343524f2e3 (diff) | |
| download | frameworks_base-4947ff462795ae9927b98fa2346634af5bbbf7c4.zip frameworks_base-4947ff462795ae9927b98fa2346634af5bbbf7c4.tar.gz frameworks_base-4947ff462795ae9927b98fa2346634af5bbbf7c4.tar.bz2 | |
am 1ae5dc12: am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev
* commit '1ae5dc12d0013835ed5c567b6e8ca3343524f2e3':
Add config to control going to sleep when entering theater mode.
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 0027b06..e5321d3 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -527,6 +527,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { private boolean mAllowTheaterModeWakeFromLidSwitch; private boolean mAllowTheaterModeWakeFromWakeGesture; + // Whether to go to sleep entering theater mode from power button + private boolean mGoToSleepOnButtonPressTheaterMode; + // Screenshot trigger states // Time to volume and power must be pressed within this interval of each other. private static final long SCREENSHOT_CHORD_DEBOUNCE_DELAY_MILLIS = 150; @@ -984,7 +987,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { Slog.i(TAG, "Toggling theater mode on."); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.THEATER_MODE_ON, 1); - if (interactive) { + + if (mGoToSleepOnButtonPressTheaterMode && interactive) { mPowerManager.goToSleep(eventTime, PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON, 0); } @@ -1236,6 +1240,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { mAllowTheaterModeWakeFromWakeGesture = mContext.getResources().getBoolean( com.android.internal.R.bool.config_allowTheaterModeWakeFromGesture); + mGoToSleepOnButtonPressTheaterMode = mContext.getResources().getBoolean( + com.android.internal.R.bool.config_goToSleepOnButtonPressTheaterMode); + mShortPressOnPowerBehavior = mContext.getResources().getInteger( com.android.internal.R.integer.config_shortPressOnPowerBehavior); mLongPressOnPowerBehavior = mContext.getResources().getInteger( |