From: Michael Gernoth <michael@gernoth.net>
Date: Mon, 4 Jul 2011 08:26:30 +0000 (+0200)
Subject: Merge branch 'master' of git.zerfleddert.de:/git/ms2-fixes
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/commitdiff_plain/7560a921751d570fccf8b91ad6bae667ab85253a?hp=bb65757a3df9410190308cd42af8af7bed47640d

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

diff --git a/MS2Debounce/assets/debounce.ko b/MS2Debounce/assets/debounce.ko
index 06a947d..c6ec28e 100644
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 ee52d86..38f39dd 100644
--- 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 80dc5ff..9c0a59e 100644
--- 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) {