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

Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev

Browse Source
This commit is contained in:
Bryce Lee
2015-03-06 20:41:12 +00:00
committed by Android (Google) Code Review
parent 8deb6d95a7 82ae149f5b
commit 1e53b98c38
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/config.xml
View File

@@ -530,6 +530,8 @@
<bool name="config_allowTheaterModeWakeFromWindowLayout">false</bool> <bool name="config_allowTheaterModeWakeFromWindowLayout">false</bool>
<!-- If this is true, go to sleep when theater mode is enabled from button press --> <!-- If this is true, go to sleep when theater mode is enabled from button press -->
<bool name="config_goToSleepOnButtonPressTheaterMode">true</bool> <bool name="config_goToSleepOnButtonPressTheaterMode">true</bool>
<!-- If this is true, long press on power button will be available from the non-interactive state -->
<bool name="config_supportLongPressPowerWhenNonInteractive">false</bool>
<!-- Auto-rotation behavior --> <!-- Auto-rotation behavior -->

1
core/res/res/values/symbols.xml
View File

@@ -1615,6 +1615,7 @@
<java-symbol type="bool" name="config_allowTheaterModeWakeFromDock" /> <java-symbol type="bool" name="config_allowTheaterModeWakeFromDock" />
<java-symbol type="bool" name="config_allowTheaterModeWakeFromWindowLayout" /> <java-symbol type="bool" name="config_allowTheaterModeWakeFromWindowLayout" />
<java-symbol type="bool" name="config_goToSleepOnButtonPressTheaterMode" /> <java-symbol type="bool" name="config_goToSleepOnButtonPressTheaterMode" />
<java-symbol type="bool" name="config_supportLongPressPowerWhenNonInteractive" />
<java-symbol type="bool" name="config_wifi_background_scan_support" /> <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_wifi_dual_band_support" />
<java-symbol type="bool" name="config_wimaxEnabled" /> <java-symbol type="bool" name="config_wimaxEnabled" />

15
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -536,6 +536,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
private boolean mAllowTheaterModeWakeFromLidSwitch; private boolean mAllowTheaterModeWakeFromLidSwitch;
private boolean mAllowTheaterModeWakeFromWakeGesture; private boolean mAllowTheaterModeWakeFromWakeGesture;
// Whether to support long press from power button in non-interactive mode
private boolean mSupportLongPressPowerWhenNonInteractive;
// Whether to go to sleep entering theater mode from power button // Whether to go to sleep entering theater mode from power button
private boolean mGoToSleepOnButtonPressTheaterMode; private boolean mGoToSleepOnButtonPressTheaterMode;
@@ -887,6 +890,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
} else { } else {
wakeUpFromPowerKey(event.getDownTime()); wakeUpFromPowerKey(event.getDownTime());
if (mSupportLongPressPowerWhenNonInteractive && hasLongPressOnPowerBehavior()) {
Message msg = mHandler.obtainMessage(MSG_POWER_LONG_PRESS);
msg.setAsynchronous(true);
mHandler.sendMessageDelayed(msg,
ViewConfiguration.get(mContext).getDeviceGlobalActionKeyTimeout());
mBeganFromNonInteractive = true;
} else {
final int maxCount = getMaxMultiPressPowerCount(); final int maxCount = getMaxMultiPressPowerCount();
if (maxCount <= 1) { if (maxCount <= 1) {
@@ -897,6 +908,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
} }
} }
}
private void interceptPowerKeyUp(KeyEvent event, boolean interactive, boolean canceled) { private void interceptPowerKeyUp(KeyEvent event, boolean interactive, boolean canceled) {
final boolean handled = canceled || mPowerKeyHandled; final boolean handled = canceled || mPowerKeyHandled;
@@ -1262,6 +1274,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mGoToSleepOnButtonPressTheaterMode = mContext.getResources().getBoolean( mGoToSleepOnButtonPressTheaterMode = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_goToSleepOnButtonPressTheaterMode); com.android.internal.R.bool.config_goToSleepOnButtonPressTheaterMode);
mSupportLongPressPowerWhenNonInteractive = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_supportLongPressPowerWhenNonInteractive);
mShortPressOnPowerBehavior = mContext.getResources().getInteger( mShortPressOnPowerBehavior = mContext.getResources().getInteger(
com.android.internal.R.integer.config_shortPressOnPowerBehavior); com.android.internal.R.integer.config_shortPressOnPowerBehavior);
mLongPressOnPowerBehavior = mContext.getResources().getInteger( mLongPressOnPowerBehavior = mContext.getResources().getInteger(