diff --git a/.idea/modules.xml b/.idea/modules.xml index 65aa193..9380290 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index f62d229..a96ed64 100644 --- a/app/app.iml +++ b/app/app.iml @@ -90,6 +90,7 @@ + @@ -105,15 +106,22 @@ + + + + + + + @@ -123,7 +131,9 @@ + + diff --git a/app/build.gradle b/app/build.gradle index 9ce2d63..4c06168 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,6 +52,24 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* + * Copyright (C) 2017 Merbin J Anselm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + /* * Copyright (C) 2016 Merbin J Anselm * @@ -84,7 +102,7 @@ android { applicationId "in.blogspot.anselmbros.torchie" minSdkVersion 15 targetSdkVersion 28 - versionCode 31 + versionCode 33 versionName "3.2" } buildTypes { diff --git a/app/src/main/java/in/blogspot/anselmbros/torchie/main/manager/device/input/key/volume/rocker/VolumeKeyRocker.java b/app/src/main/java/in/blogspot/anselmbros/torchie/main/manager/device/input/key/volume/rocker/VolumeKeyRocker.java index 60ef189..9662305 100644 --- a/app/src/main/java/in/blogspot/anselmbros/torchie/main/manager/device/input/key/volume/rocker/VolumeKeyRocker.java +++ b/app/src/main/java/in/blogspot/anselmbros/torchie/main/manager/device/input/key/volume/rocker/VolumeKeyRocker.java @@ -16,6 +16,24 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* + * Copyright (C) 2017 Merbin J Anselm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + /* * Copyright (C) 2016 Merbin J Anselm * @@ -80,7 +98,7 @@ protected boolean isKeyComboPerformed() { for (int i = 0; i < current_ptr; i++) { if (i > 0) { int a = buffer[i], b = buffer[i - 1]; - if (a == (-1 * b)) { + if ((a == -1 && b == 1) || (a == 1 && b == -1)) { this.clearBuffer(); keyComboPerformed = true; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d3b6fd..8b9c65a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,21 @@ + + +