From c52453ea1ace4b89d6381b44866b3ef1489ccf91 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Tue, 31 May 2016 09:03:38 +0000
Subject: [PATCH] Volume buttons

---
 jni/src/Xash3D/xash3d                  | 2 +-
 src/in/celest/xash3d/XashActivity.java | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index fbb62fba..a581d086 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit fbb62fbaebb3b92b09eb2979e4cf34b7a53fce92
+Subproject commit a581d08683dd5c6b5695cc334acd9d5d56b23f31
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index e4d72703..78653a6d 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -40,6 +40,7 @@ public class XashActivity extends Activity {
 
 		// Preferences
 	public static SharedPreferences mPref = null;
+	private static boolean mUseVolume;
 
 	// Audio
 	private static Thread mAudioThread;
@@ -125,6 +126,7 @@ public class XashActivity extends Activity {
 		InstallReceiver.extractPAK(this, false);
 
 		mPixelFormat = mPref.getInt("pixelformat", 0);
+		mUseVolume = mPref.getBoolean("usevolume", false);
 		AndroidBug5497Workaround.assistActivity(this);
 	}
 
@@ -211,6 +213,9 @@ public class XashActivity extends Activity {
 	public static boolean handleKey( int keyCode, KeyEvent event )
 	{
 
+	if ( mUseVolume && ( keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+			keyCode == KeyEvent.KEYCODE_VOLUME_UP ) )
+		return false;
 		//Log.d( TAG, "Keycode " + keyCode );
 		if (event.getAction() == KeyEvent.ACTION_DOWN)
 		{