diff options
| author | Bryce Lee <brycelee@google.com> | 2014-11-04 12:43:44 -0800 |
|---|---|---|
| committer | Bryce Lee <brycelee@google.com> | 2014-11-04 12:43:44 -0800 |
| commit | 55e846d4a2496594e1147a1c5bae1439417e8ddf (patch) | |
| tree | 7b09a3c2fa10593f6bae160149a67965f7cc2145 | |
| parent | 2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae (diff) | |
| download | frameworks_base-55e846d4a2496594e1147a1c5bae1439417e8ddf.zip frameworks_base-55e846d4a2496594e1147a1c5bae1439417e8ddf.tar.gz frameworks_base-55e846d4a2496594e1147a1c5bae1439417e8ddf.tar.bz2 | |
Add config to control going to sleep when entering theater mode.
Bug: 18241209
Change-Id: I7fa29d92391b1c8ab74585008d6599fd7174cc61
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 9 |
3 files changed, 11 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 2ad0cbc..ebac30a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -472,6 +472,8 @@ <bool name="config_allowTheaterModeWakeFromDock">false</bool> <!-- If this is true, allow wake from theater mode from window layout flag. --> <bool name="config_allowTheaterModeWakeFromWindowLayout">false</bool> + <!-- If this is true, go to sleep when theater mode is enabled from button press --> + <bool name="config_goToSleepOnButtonPressTheaterMode">true</bool> <!-- Auto-rotation behavior --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 9172735..18c3be5 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1582,6 +1582,7 @@ <java-symbol type="bool" name="config_allowTheaterModeWakeFromLidSwitch" /> <java-symbol type="bool" name="config_allowTheaterModeWakeFromDock" /> <java-symbol type="bool" name="config_allowTheaterModeWakeFromWindowLayout" /> + <java-symbol type="bool" name="config_goToSleepOnButtonPressTheaterMode" /> <java-symbol type="bool" name="config_wifi_background_scan_support" /> <java-symbol type="bool" name="config_wifi_dual_band_support" /> <java-symbol type="bool" name="config_wimaxEnabled" /> diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 0ac679e..21d4297 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -526,6 +526,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; @@ -983,7 +986,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); } @@ -1235,6 +1239,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( |