diff --git a/RecompileAllApps.sh b/RecompileAllApps.sh index d566c404c..074e13b7e 100755 --- a/RecompileAllApps.sh +++ b/RecompileAllApps.sh @@ -50,10 +50,11 @@ for APP1 in project/jni/application/*/AndroidAppSettings.cfg; do NDKBUILD=`which ndk-build | sed 's@/[^/]*/ndk-build@/android-ndk-r4-crystax@'`/ndk-build fi echo Compiling $APP + APPVERSION=`grep 'AppVersionCode=' AndroidAppSettings.cfg | sed 's/AppVersionCode=\(.*\)/\1/'` OLDPATH="`pwd`" ( cd project && nice -n5 $NDKBUILD -j2 V=1 && ant release && \ jarsigner -verbose -keystore "$KEYSTORE" -storepass "$PASSWORD" bin/DemoActivity-unsigned.apk $ALIAS && \ zipalign 4 bin/DemoActivity-unsigned.apk ../apk/$APP.apk && \ - mkdir -p debuginfo/$APP && cp -f obj/local/armeabi/libapplication.so obj/local/armeabi/libsdl-*.so debuginfo/$APP && + mkdir -p debuginfo/$APP-$APPVERSION && cp -f obj/local/armeabi/libapplication.so obj/local/armeabi/libsdl-*.so debuginfo/$APP-$APPVERSION && cd .. ) || exit 1 done diff --git a/project/java/Settings.java b/project/java/Settings.java index 994c2a500..a755462db 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -139,6 +139,30 @@ class Settings showDownloadConfig(p); } + static void showConfigMainMenu(final MainActivity p) + { + final CharSequence[] items = { p.getResources().getString(R.string.storage_question), + p.getResources().getString(R.string.accel_medium), + p.getResources().getString(R.string.accel_slow) }; + + AlertDialog.Builder builder = new AlertDialog.Builder(p); + builder.setTitle(R.string.accel_question); + builder.setSingleChoiceItems(items, Globals.AccelerometerSensitivity, new DialogInterface.OnClickListener() + { + public void onClick(DialogInterface dialog, int item) + { + Globals.AccelerometerSensitivity = item; + + dialog.dismiss(); + showAccelerometerCenterConfig(p); + } + }); + AlertDialog alert = builder.create(); + alert.setOwnerActivity(p); + alert.show(); + } + + static void showDownloadConfig(final MainActivity p) { long freeSdcard = 0; diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index 54a52fa6b..b53a9775d 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -11,7 +11,7 @@ SdlVideoResizeKeepAspect=n NeedDepthBuffer=n AppUsesMouse=y AppNeedsTwoButtonMouse=y -AppNeedsArrowKeys=n +AppNeedsArrowKeys=y AppNeedsTextInput=y AppUsesJoystick=n AppHandlesJoystickSensitivity=n