From f1b8ebeaa160b3d690503a619bc8ccaf0e5e66fc Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Sat, 26 May 2012 22:40:06 -0600
Subject: [PATCH] reset vibration on manual time change

---
 AndroidManifest.xml                          | 4 ++--
 Makefile                                     | 2 +-
 src/org/woozle/penaltytimer/TimerButton.java | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e17155b..94bc23b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.woozle.penaltytimer"
-      android:versionCode="4"
-      android:versionName="1.1">
+      android:versionCode="5"
+      android:versionName="1.2">
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <application android:label="@string/app_name" android:description="@string/description" android:icon="@drawable/ic_launcher">
diff --git a/Makefile b/Makefile
index 7063cbc..3429d9a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ clean:
 	ant clean
 
 bin/PenaltyTimer-release.apk: bin/PenaltyTimer-release-unaligned.apk
-	$(ZIPALIGN) -v 4 $< $@
+	$(ZIPALIGN) -f 4 $< $@
 	
 bin/PenaltyTimer-release-unaligned.apk: bin/PenaltyTimer-release-unsigned.apk
 	jarsigner -verbose -sigalg MD5withRSA -digestalg SHA1 -keystore $(KEYSTORE) -signedjar $@ $< $(ALIAS)
diff --git a/src/org/woozle/penaltytimer/TimerButton.java b/src/org/woozle/penaltytimer/TimerButton.java
index 69dcc6c..c2e8581 100644
--- a/src/org/woozle/penaltytimer/TimerButton.java
+++ b/src/org/woozle/penaltytimer/TimerButton.java
@@ -79,6 +79,7 @@ public class TimerButton
     }
 
     public void set(long t) {
+        shook = false;
         startTime = now;
         duration = t;
     }