psmattas/device_motorola_sanders
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sanders: update KeyHandler for api change

Browse Source
This commit is contained in:
Vachounet
2017-12-09 20:56:38 +01:00
committed by Keertesh19
parent 6b3519493c
commit 4297fc997e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MotoActions/src/com/moto/actions/KeyHandler.java
View File

@@ -438,7 +438,7 @@ public class KeyHandler implements DeviceKeyHandler {
return node; return node;
} }
public boolean handleKeyEvent(KeyEvent event) { public KeyEvent handleKeyEvent(KeyEvent event) {
int scanCode = event.getScanCode(); int scanCode = event.getScanCode();
if (DEBUG) { if (DEBUG) {
@@ -452,7 +452,7 @@ public class KeyHandler implements DeviceKeyHandler {
boolean isFPScanCode = ArrayUtils.contains(sSupportedFPGestures, scanCode); boolean isFPScanCode = ArrayUtils.contains(sSupportedFPGestures, scanCode);
if (!isFPScanCode) { if (!isFPScanCode) {
return false; return event;
} }
boolean isFPGestureEnabled = FileUtils.readOneLine(FP_HOME_NODE).equals("1"); boolean isFPGestureEnabled = FileUtils.readOneLine(FP_HOME_NODE).equals("1");
@@ -462,12 +462,12 @@ public class KeyHandler implements DeviceKeyHandler {
// We only want ACTION_UP event // We only want ACTION_UP event
if (event.getAction() != KeyEvent.ACTION_UP) { if (event.getAction() != KeyEvent.ACTION_UP) {
return true; return null;
} }
if (isFPScanCode){ if (isFPScanCode){
if (fpGesturePending) { if (fpGesturePending) {
return false; return event;
} else { } else {
resetFPGestureDelay(); resetFPGestureDelay();
fpGesturePending = true; fpGesturePending = true;
@@ -482,7 +482,7 @@ public class KeyHandler implements DeviceKeyHandler {
if (isFPScanCode) { if (isFPScanCode) {
if ((!isFPGestureEnabled) || (!isScreenOn && !isFPGestureEnabledOnScreenOff)) { if ((!isFPGestureEnabled) || (!isScreenOn && !isFPGestureEnabledOnScreenOff)) {
resetDoubleTapOnFP(); resetDoubleTapOnFP();
return false; return event;
} }
if (!isScreenOn && isFPGestureEnabledOnScreenOff) { if (!isScreenOn && isFPGestureEnabledOnScreenOff) {
processFPScreenOffScancode(scanCode); processFPScreenOffScancode(scanCode);
@@ -490,7 +490,7 @@ public class KeyHandler implements DeviceKeyHandler {
processFPScancode(scanCode); processFPScancode(scanCode);
} }
} }
return true; return null;
} }
private void processFPScancode(int scanCode) { private void processFPScancode(int scanCode) {