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

Merge "Add Option To Prevent Wake On Back Key Press" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-25 02:10:32 +00:00
committed by Android (Google) Code Review
parent bf2b4a3854 2faf788151
commit ba58fd615f
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/view/KeyEvent.java
View File

@@ -1941,7 +1941,6 @@ public class KeyEvent extends InputEvent implements Parcelable {
/** @hide */
public static final boolean isWakeKey(int keyCode) {
switch (keyCode) {
case KeyEvent.KEYCODE_BACK:
case KeyEvent.KEYCODE_CAMERA:
case KeyEvent.KEYCODE_MENU:
case KeyEvent.KEYCODE_PAIRING:

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

@@ -4404,6 +4404,7 @@
Determines whether the specified key groups can be used to wake up the device. -->
<bool name="config_wakeOnDpadKeyPress">true</bool>
<bool name="config_wakeOnAssistKeyPress">true</bool>
<bool name="config_wakeOnBackKeyPress">true</bool>
<!-- Whether to default to an expanded list of users on the lock screen user switcher. -->
<bool name="config_expandLockScreenUserSwitcher">false</bool>

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

@@ -3051,6 +3051,7 @@
<!-- Override Wake Key Behavior When Screen is Off -->
<java-symbol type="bool" name="config_wakeOnDpadKeyPress" />
<java-symbol type="bool" name="config_wakeOnAssistKeyPress" />
<java-symbol type="bool" name="config_wakeOnBackKeyPress" />
<!-- Pinner Service -->
<java-symbol type="array" name="config_defaultPinnerServiceFiles" />

6
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -482,6 +482,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
MetricsLogger mLogger;
boolean mWakeOnDpadKeyPress;
boolean mWakeOnAssistKeyPress;
boolean mWakeOnBackKeyPress;
private boolean mHandleVolumeKeysInWM;
@@ -1736,6 +1737,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
res.getBoolean(com.android.internal.R.bool.config_wakeOnDpadKeyPress);
mWakeOnAssistKeyPress =
res.getBoolean(com.android.internal.R.bool.config_wakeOnAssistKeyPress);
mWakeOnBackKeyPress =
res.getBoolean(com.android.internal.R.bool.config_wakeOnBackKeyPress);
// Init display burn-in protection
boolean burnInProtectionEnabled = context.getResources().getBoolean(
@@ -4107,6 +4110,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case KeyEvent.KEYCODE_ASSIST:
return mWakeOnAssistKeyPress;
case KeyEvent.KEYCODE_BACK:
return mWakeOnBackKeyPress;
}
return true;