From d5413b3c15107708c222670fce88eb427252ce09 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Fri, 25 Feb 2011 14:59:32 +0000
Subject: [PATCH] Same SDL keycode for Camera and Focus keys

---
 project/AndroidManifestTemplate.xml                      | 2 +-
 project/java/translations/values-de/strings.xml          | 2 ++
 project/java/translations/values-fi/strings.xml          | 2 ++
 project/java/translations/values-fr/strings.xml          | 2 ++
 project/java/translations/values-ru/strings.xml          | 2 ++
 project/java/translations/values-uk/strings.xml          | 2 ++
 project/jni/application/src                              | 2 +-
 project/jni/sdl-1.3/src/video/android/SDL_androidinput.c | 3 ++-
 8 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/project/AndroidManifestTemplate.xml b/project/AndroidManifestTemplate.xml
index 05dd65278..5eefada5f 100644
--- a/project/AndroidManifestTemplate.xml
+++ b/project/AndroidManifestTemplate.xml
@@ -5,7 +5,7 @@
       android:versionName="1.0.0 - intiial version"
       android:installLocation="preferExternal"
 >
-    <application android:label="@string/app_name" 
+    <application android:label="@string/app_name"
                  android:icon="@drawable/icon"
     >
         <activity android:name=".MainActivity"
diff --git a/project/java/translations/values-de/strings.xml b/project/java/translations/values-de/strings.xml
index e9a4f876c..c395be847 100644
--- a/project/java/translations/values-de/strings.xml
+++ b/project/java/translations/values-de/strings.xml
@@ -125,4 +125,6 @@
 <string name="pointandclick_relative_speed">Relative Maus Bewegungsgeschwindigkeit</string>
 <string name="pointandclick_relative_accel">Relative Bewegung der Maus Beschleunigung</string>
 <string name="downloads">Downloads</string>
+<string name="video_separatethread">Separaten Thread für Video, FPS bei einigen Geräten zu erhöhen</string>
+<string name="text_edit_click_here">Tippen Sie auf der Eingabe beginnen, drücken Sie Zurück, wenn Sie fertig</string>
 </resources>
diff --git a/project/java/translations/values-fi/strings.xml b/project/java/translations/values-fi/strings.xml
index e7e091411..c2bbdae26 100644
--- a/project/java/translations/values-fi/strings.xml
+++ b/project/java/translations/values-fi/strings.xml
@@ -125,4 +125,6 @@
 <string name="pointandclick_relative_speed">Suhteellinen hiiren liikkeen nopeus</string>
 <string name="pointandclick_relative_accel">Suhteellinen hiiren liikkeen kiihtyvyys</string>
 <string name="downloads">Downloads</string>
+<string name="video_separatethread">Erillisessä säikeessä video, kasvaa FPS joissakin laitteissa</string>
+<string name="text_edit_click_here">Napauta aloittaa kirjoittamisen, paina Takaisin, kun olet valmis</string>
 </resources>
diff --git a/project/java/translations/values-fr/strings.xml b/project/java/translations/values-fr/strings.xml
index b77b08354..d5327bc3a 100644
--- a/project/java/translations/values-fr/strings.xml
+++ b/project/java/translations/values-fr/strings.xml
@@ -128,4 +128,6 @@
 <string name="pointandclick_relative_speed">Relative vitesse de déplacement de la souris</string>
 <string name="pointandclick_relative_accel">Relative accélération du mouvement de la souris</string>
 <string name="downloads">Téléchargements</string>
+<string name="video_separatethread">thread séparé pour la vidéo, va augmenter FPS sur certains appareils</string>
+<string name="text_edit_click_here">Appuyez sur pour commencer à taper, appuyez sur Retour lorsque vous avez terminé</string>
 </resources>
diff --git a/project/java/translations/values-ru/strings.xml b/project/java/translations/values-ru/strings.xml
index fb568af02..48a9acee9 100644
--- a/project/java/translations/values-ru/strings.xml
+++ b/project/java/translations/values-ru/strings.xml
@@ -118,4 +118,6 @@
 <string name="pointandclick_relative_speed">Скорость движения мыши</string>
 <string name="pointandclick_relative_accel">Ускорение движения мыши</string>
 <string name="downloads">Загрузки</string>
+<string name="video_separatethread">Отдельный поток для видео, увеличит FPS на некоторых устройствах</string>
+<string name="text_edit_click_here">Нажмите, чтобы ввести текст, нажмите Назад, когда закончите</string>
 </resources>
diff --git a/project/java/translations/values-uk/strings.xml b/project/java/translations/values-uk/strings.xml
index 334a330be..87af588db 100644
--- a/project/java/translations/values-uk/strings.xml
+++ b/project/java/translations/values-uk/strings.xml
@@ -118,4 +118,6 @@
 <string name="pointandclick_relative_speed">Швидкість руху миші</string>
 <string name="pointandclick_relative_accel">Прискорення руху миші</string>
 <string name="downloads">Завантаження</string>
+<string name="video_separatethread">Окремий потік для відео, збільшить FPS на деяких пристроях</string>
+<string name="text_edit_click_here">Натисніть, щоб ввести текст, натисніть Назад, коли закiнчете</string>
 </resources>
diff --git a/project/jni/application/src b/project/jni/application/src
index 59d41f41e..104f796a6 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-fheroes2
\ No newline at end of file
+ballfield
\ No newline at end of file
diff --git a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
index 3af624850..2c76598a1 100644
--- a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
+++ b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
@@ -1832,7 +1832,9 @@ JAVA_EXPORT_NAME(Settings_nativeInitKeymap) ( JNIEnv*  env, jobject thiz )
   
   keymap[KEYCODE_HOME] = SDL_KEY(HOME); // Cannot be used in application
 
+  // On some devices pressing Camera key will generate Camera keyevent, but releasing it will generate Focus keyevent.
   keymap[KEYCODE_CAMERA] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_KEYCODE_6));
+  keymap[KEYCODE_FOCUS] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_KEYCODE_6));
 
   keymap[KEYCODE_0] = SDL_KEY(0);
   keymap[KEYCODE_1] = SDL_KEY(1);
@@ -1922,7 +1924,6 @@ JAVA_EXPORT_NAME(Settings_nativeInitKeymap) ( JNIEnv*  env, jobject thiz )
   keymap[KEYCODE_ENVELOPE] = SDL_KEY(F4);
 
   keymap[KEYCODE_HEADSETHOOK] = SDL_KEY(F5);
-  keymap[KEYCODE_FOCUS] = SDL_KEY(F6);
   keymap[KEYCODE_NOTIFICATION] = SDL_KEY(F7);
 
   // Cannot be received by application, OS internal