project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java
changeset 7006 6af78154dc62
parent 6839 2dd2c0f2c9d0
parent 6901 c021699c33dc
child 7110 c91d33837b0d
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java	Sun Apr 01 15:23:34 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java	Wed May 02 23:53:45 2012 +0200
@@ -100,11 +100,6 @@
 		super.onResume();
 	}
 
-	public void onBackPressed(){
-		super.onBackPressed();
-		PascalExports.HWterminate(true);
-	}
-
 	protected void onDestroy() {
 		super.onDestroy();
 		Log.v("SDL", "onDestroy()");
@@ -441,7 +436,7 @@
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}
-		//Log.v("SDL", "SDL thread terminated");
+		Log.v("SDL", "SDL thread terminated");
 		//Log.v("SDL", "SDL thread terminated");
 	}
 }
@@ -481,14 +476,14 @@
 		Log.v("SDL", "surfaceCreated()");
 		holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
 		SDLActivity.createEGLSurface();
-//		enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+		//		enableSensor(Sensor.TYPE_ACCELEROMETER, true);
 	}
 
 	// Called when we lose the surface
 	public void surfaceDestroyed(SurfaceHolder holder) {
 		Log.v("SDL", "surfaceDestroyed()");
 		SDLActivity.nativePause();
-//		enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+		//		enableSensor(Sensor.TYPE_ACCELEROMETER, false);
 	}
 
 	// Called when the surface is resized
@@ -554,7 +549,15 @@
 
 	// Key events
 	public boolean onKey(View  v, int keyCode, KeyEvent event) {
-		if(keyCode == KeyEvent.KEYCODE_BACK) return false;
+		switch(keyCode){
+		case KeyEvent.KEYCODE_BACK:
+		        PascalExports.HWterminate(true);
+                        return true;
+		case KeyEvent.KEYCODE_VOLUME_DOWN:
+		case KeyEvent.KEYCODE_VOLUME_UP:
+		case KeyEvent.KEYCODE_VOLUME_MUTE:
+			return false;
+		}
 		if (event.getAction() == KeyEvent.ACTION_DOWN) {
 			//Log.v("SDL", "key down: " + keyCode);
 			SDLActivity.onNativeKeyDown(keyCode);