Merge branch 'master' of git.zerfleddert.de:/git/ms2-fixes

diff --git a/MS2Debounce/assets/debounce.ko b/MS2Debounce/assets/debounce.ko
index 06a947d8e5d3a0f041acf11d8d4afb6e9ed3b685..c6ec28e26513f0f56e98eae5ebf96818fa29a5f6 100644 (file)
Binary files a/MS2Debounce/assets/debounce.ko and b/MS2Debounce/assets/debounce.ko differ

diff --git a/MS2Debounce/build.properties b/MS2Debounce/build.properties
index ee52d86d94a40e7092dc34d1b2760244ec7dccaf..38f39dd96c351bf9f45b0bac23b4d58ced9e51a1 100644 (file)
--- a/MS2Debounce/build.properties
+++ b/MS2Debounce/build.properties
@@ -14,4 +14,5 @@
 #  'key.store' for the location of your keystore and
 #  'key.alias' for the name of the key to use.
 # The password will be asked during the build when you use the 'release' target.
-
+key.store=/home/michael/Android/devel-key/gernoth.keystore
+key.alias=de.rmdir.key

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index 80dc5ff134745fabb87e4ac221252d180ff7da73..9c0a59e5da45e422a6702da9844b3f96504d855d 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -57,7 +57,7 @@ public class DebounceModuleHelper
                        return;
                }
 
-               if (getDelay() <= 0) {
+               if (getDelay() < 0) {
                        return;
                }
 
@@ -126,7 +126,7 @@ public class DebounceModuleHelper
        public synchronized int getSavedDelay() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
-               return settings.getInt("debounce_delay", 10);
+               return settings.getInt("debounce_delay", 15);
        }
 
        public synchronized void setSavedDelay(int delay) {