From d7fc2ce9dbc78337f65b6dad38b63e9a396065c6 Mon Sep 17 00:00:00 2001
From: Arnav Gupta <championswimmer@gmail.com>
Date: Fri, 22 Jun 2012 16:04:44 +0530
Subject: [PATCH 1/5] make achepclock to override deskclock

---
 Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 5892f35252..aed00c07c7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,9 +7,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := DeskClock
+LOCAL_PACKAGE_NAME := AchepClock
 
-LOCAL_OVERRIDES_PACKAGES := AlarmClock
+LOCAL_OVERRIDES_PACKAGES := AlarmClock DeskClock
 
 LOCAL_SDK_VERSION := current
 

From 7b98063e095747080ea1a10d424e4afb8e851d03 Mon Sep 17 00:00:00 2001
From: Arnav Gupta <championswimmer@gmail.com>
Date: Fri, 22 Jun 2012 18:33:54 +0530
Subject: [PATCH 2/5] fix deskclocktests conflict

---
 tests/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Android.mk b/tests/Android.mk
index 50561453de..b422b24978 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,8 +9,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := DeskClockTests
+LOCAL_PACKAGE_NAME := AchepClockTests
 
-LOCAL_INSTRUMENTATION_FOR := DeskClock
+LOCAL_INSTRUMENTATION_FOR := AchepClock
 
 include $(BUILD_PACKAGE)

From d405bd6eaa80e763a8af321836b4579bd5c1fb15 Mon Sep 17 00:00:00 2001
From: Daveee10 <daver16@msn.com>
Date: Sun, 24 Jun 2012 21:46:51 +0200
Subject: [PATCH 3/5] Fix Default and Hungarian language missing strings

---
 Android.mk                |  4 ++--
 res/values-hu/strings.xml | 17 +++++++++++++++++
 res/values/strings.xml    |  2 +-
 tests/Android.mk          |  4 ++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Android.mk b/Android.mk
index aed00c07c7..5892f35252 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,9 +7,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := AchepClock
+LOCAL_PACKAGE_NAME := DeskClock
 
-LOCAL_OVERRIDES_PACKAGES := AlarmClock DeskClock
+LOCAL_OVERRIDES_PACKAGES := AlarmClock
 
 LOCAL_SDK_VERSION := current
 
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b037bf9e80..641c781a09 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -153,4 +153,21 @@
     <string name="loading_ringtone" msgid="6523322777415268044">"Csengőhang betöltése..."</string>
     <string name="control_set_alarm" msgid="2194676418924016327">"Ébresztés beállítása"</string>
     <string name="control_set_alarm_with_existing" msgid="1128169496817859490">"Ébresztés időpontja: <xliff:g id="TIME">%s</xliff:g>"</string>
+
+    <string name="shake_title">Telefon rázása</string>
+    <string name="shake_summary">A telefon megrázása
+        <xliff:g id="action">%s</xliff:g></string>
+    <string name="shake_dialog">A telefon megrázása&#8230;</string>
+    <string name="math_title">Matek feladat</string>
+    <string name="math_summary">Old meg a feladatot az ébresztés némításához</string>
+    <string name="math_dialog">Ébren vagy?</string>
+    <string name="increasing_volume_title">Hangerő növelése</string>
+    <string name="increasing_volume_summary">Válaszd ezt az opciót a hangerő magasabb szintre állításához</string>
+    
+    <!-- Stopwatch label -->
+    <string name="stopwatch_activity">Stopper óra</string>
+    <string name="stopwatch_pause">Szünet</string>
+    <string name="stopwatch_start">Kezdés</string>
+    <string name="stopwatch_lap">Köridő</string>
+    <string name="stopwatch_reset">Nulláz</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1d1a78b070..eebe159b6f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -329,7 +329,7 @@
     <string name="control_set_alarm_with_existing">Alarm set: <xliff:g id="time">%s</xliff:g></string>
 
     <!-- Shake to snooze/dismiss/nothing alarm -->
-    
+    <string name="shake_title">Shake</string>
     <string name="shake_summary">Shake to
         <xliff:g id="action">%s</xliff:g></string>
     <string name="shake_dialog">Shake device to&#8230;</string>
diff --git a/tests/Android.mk b/tests/Android.mk
index b422b24978..50561453de 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,8 +9,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := AchepClockTests
+LOCAL_PACKAGE_NAME := DeskClockTests
 
-LOCAL_INSTRUMENTATION_FOR := AchepClock
+LOCAL_INSTRUMENTATION_FOR := DeskClock
 
 include $(BUILD_PACKAGE)

From 7827a25ad8cb14474b311ff0bbf2191457e5dc24 Mon Sep 17 00:00:00 2001
From: Daveee10 <daver16@msn.com>
Date: Sun, 24 Jun 2012 21:49:53 +0200
Subject: [PATCH 4/5] Merge championswimmer's changes

---
 Android.mk       | 4 ++--
 tests/Android.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index 5892f35252..aed00c07c7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,9 +7,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := DeskClock
+LOCAL_PACKAGE_NAME := AchepClock
 
-LOCAL_OVERRIDES_PACKAGES := AlarmClock
+LOCAL_OVERRIDES_PACKAGES := AlarmClock DeskClock
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/Android.mk b/tests/Android.mk
index 50561453de..b422b24978 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,8 +9,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := DeskClockTests
+LOCAL_PACKAGE_NAME := AchepClockTests
 
-LOCAL_INSTRUMENTATION_FOR := DeskClock
+LOCAL_INSTRUMENTATION_FOR := AchepClock
 
 include $(BUILD_PACKAGE)

From c3309c752f412a52aa9ef4dc870e79f0ad426fbf Mon Sep 17 00:00:00 2001
From: Daveee10 <daver16@msn.com>
Date: Thu, 28 Jun 2012 20:30:13 +0200
Subject: [PATCH 5/5] Fix: Math - Double "9" button

---
 src/com/android/deskclock/AlarmMath.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/deskclock/AlarmMath.java b/src/com/android/deskclock/AlarmMath.java
index a95bb75e7e..5540fad016 100644
--- a/src/com/android/deskclock/AlarmMath.java
+++ b/src/com/android/deskclock/AlarmMath.java
@@ -136,7 +136,7 @@ public void onClick(View v) {
 				updateText();
 			}
 		});
-		button.setText("9");
+		button.setText("0");
 		button = (Button) findViewById(R.id.math_reset);
 		button.setOnClickListener(new OnClickListener() {
 			@Override