diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh index c5f7cb9b4..01c31211c 100755 --- a/ChangeAppSettings.sh +++ b/ChangeAppSettings.sh @@ -68,6 +68,7 @@ echo "If the URL in in the form ':dir/file.dat:http://URL/' it will be downloade echo "If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -" echo "these files are put inside .apk package by build system" echo "Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS" +echo " " echo "`echo $AppDataDownloadUrl | tr '^' '\\n'`" echo AppDataDownloadUrl1="" diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index 153d88df5..a89801033 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -269,7 +269,7 @@ public class MainActivity extends Activity { if ((sendBackspace && event.getAction() == KeyEvent.ACTION_UP) && (keyCode == KeyEvent.KEYCODE_DEL || keyCode == KeyEvent.KEYCODE_CLEAR)) { synchronized(textInput) { - DemoRenderer.nativeTextInput( 8, 8 ); // Send backspace to native code + DemoRenderer.nativeTextInput( 8, 0 ); // Send backspace to native code } return false; // and proceed to delete text in keyboard input field } diff --git a/project/jni/application/src b/project/jni/application/src index 104f796a6..92362c4db 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -ballfield \ No newline at end of file +ufoai \ 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 b9ab11bcf..1b436e462 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 @@ -1613,7 +1613,7 @@ extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode ) deferredTextIdx2 = 0; deferredText[deferredTextIdx2].down = SDL_PRESSED; deferredText[deferredTextIdx2].scancode = SDLK_LSHIFT; - deferredText[deferredTextIdx2].unicode = SDLK_LSHIFT; + deferredText[deferredTextIdx2].unicode = 0; } deferredTextIdx2++; if( deferredTextIdx2 >= DEFERRED_TEXT_COUNT ) @@ -1635,7 +1635,7 @@ extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode ) deferredTextIdx2 = 0; deferredText[deferredTextIdx2].down = SDL_RELEASED; deferredText[deferredTextIdx2].scancode = SDLK_LSHIFT; - deferredText[deferredTextIdx2].unicode = SDLK_LSHIFT; + deferredText[deferredTextIdx2].unicode = 0; } SDL_mutexV(deferredTextMutex);