From dab20204ce349c170b94d059fa0805e5d9a51545 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 13 May 2016 22:29:13 +0000
Subject: [PATCH 1/6] Update branches

---
 jni/src/Xash3D/xash3d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 973f8686..e685152d 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 973f8686e0884c04f79eb0265f3a7ce2bc3235ad
+Subproject commit e685152df20f67d73ab5f90c924d97c87bfbda4f

From fa1d58020b6399dfae5a35f031ab7231a623a36f Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 15 May 2016 09:25:43 +0000
Subject: [PATCH 2/6] Update engine

---
 jni/src/Xash3D/xash3d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index e685152d..eebd633f 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit e685152df20f67d73ab5f90c924d97c87bfbda4f
+Subproject commit eebd633f6307c3e921b8086fd236184ce8f2d25d

From 1333895aa6b9a24a1f4ba00a071958d424d6f231 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 16 May 2016 22:24:23 +0000
Subject: [PATCH 3/6] Update engine

---
 jni/src/Xash3D/xash3d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index eebd633f..a1ffbf31 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit eebd633f6307c3e921b8086fd236184ce8f2d25d
+Subproject commit a1ffbf310f7cfc08647bd8731f7c45b6e31b37c5

From cd1c47245acebd33ea6039d7db8e828718a06b51 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 27 May 2016 00:18:02 +0000
Subject: [PATCH 4/6] Update engine

---
 jni/src/Xash3D/xash3d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index a1ffbf31..fbb62fba 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit a1ffbf310f7cfc08647bd8731f7c45b6e31b37c5
+Subproject commit fbb62fbaebb3b92b09eb2979e4cf34b7a53fce92

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 5/6] 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)
 		{

From 1fde2ba0ddc3d323739aa936a39202de42e209d0 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Tue, 31 May 2016 12:23:09 +0000
Subject: [PATCH 6/6] Update layout

---
 res/layout/activity_fpicker.xml            | 12 +++---
 res/layout/activity_launcher.xml           | 50 +++++++++++++++++-----
 res/values-ru/strings.xml                  |  6 ++-
 res/values/strings.xml                     |  7 +--
 src/in/celest/xash3d/LauncherActivity.java | 38 ++++++++++++----
 5 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/res/layout/activity_fpicker.xml b/res/layout/activity_fpicker.xml
index 7001b44e..fde6e1ac 100644
--- a/res/layout/activity_fpicker.xml
+++ b/res/layout/activity_fpicker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -7,20 +7,20 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="in.celest.xash3dVR.FPicker">
+    tools:context="in.celest.xash3dVR.FPicker"
+    android:orientation="vertical">
 
     <ListView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/FileView"
-        android:layout_above="@+id/button2" />
+        android:id="@+id/FileView"
+        android:layout_weight="1"/>
 
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/folder"
         android:id="@+id/button_fpicker_select"
-        android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:onClick="onFileClick" />
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index fa08ecca..670c604b 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -97,6 +97,15 @@
                         android:orientation="vertical"
                         android:weightSum="1">
 
+                        <TextView
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="3dp"
+                            android:text="@string/volume"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
 
                         <ToggleButton
                             android:id="@+id/useVolume"
@@ -125,6 +134,17 @@
                         <!--android:id="@+id/Tracking"/>-->
 
 
+                        <TextView
+                            android:id="@+id/textView_path"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="3dp"
+                            android:text="@string/text_res_path"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
+
 
                         <Button
                             android:id="@+id/button_select"
@@ -137,8 +157,16 @@
                             android:layout_marginRight="10dp"
                             android:onClick="selectFolder"
                             android:text="@string/select_folder" />
-
-
+                        <Button
+                            android:id="@+id/button_shortcut"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_marginTop="10dp"
+                            android:onClick="createShortcut"
+                            android:text="@string/create_shortcut_button" />
 
                     </LinearLayout>
 
@@ -203,7 +231,6 @@
                             android:layout_marginTop="3dp" />
 
                         <TextView
-                            android:id="@+id/textView_path"
                             android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginBottom="10dp"
@@ -213,6 +240,7 @@
                             android:text="@string/text_res_path"
                             android:textAppearance="?android:attr/textAppearanceMedium" />
 
+
                         <EditText
                             android:id="@+id/cmdPath"
                             android:layout_width="match_parent"
@@ -223,19 +251,19 @@
                             android:layout_marginTop="3dp" />
 
 
-                        <Button
-                            android:id="@+id/button_shortcut"
-                            android:layout_width="match_parent"
+                    <TextView
+                            android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginBottom="10dp"
                             android:layout_marginLeft="10dp"
                             android:layout_marginRight="10dp"
-                            android:layout_marginTop="10dp"
-                            android:onClick="createShortcut"
-                            android:text="@string/create_shortcut_button" />
+                            android:layout_marginTop="3dp"
+                            android:text="Pixel format"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
+
                     <Spinner
-			    android:layout_height="match_parent"
-			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:layout_width="match_parent"
 			    android:id="@+id/pixelSpinner"
                             android:layout_marginBottom="10dp"
                             android:layout_marginLeft="10dp"
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0fa5a456..8dfbc0ad 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3,7 +3,9 @@
     <string name="cmd_args_text">Аргументы командной строки(только для экспертов)</string>
     <string name="launch_button">Запустить Xash3D</string>
 	<string name="use_controls">Включить экранное управление</string>
-	<string name="use_volume">Использовать кнопки громкости</string>
+	<string name="volume">Действие кнопок громкости</string>
+	<string name="use_volume">Регулировка громкости</string>
+	<string name="no_volume">Использовать в игре</string>
 	<string name="text_res_path">Путь к ресурсам игры</string>
 	<string name="touch_set">Настройки управления</string>
 	<string name="text_shortcut">Ярлык Xash3D</string>
@@ -26,4 +28,6 @@
 	<string name="action_settings">Настройки</string>
 	<string name="text_shortcut_test">Ярлык Xash3D (тест)</string>
 	<string name="create_shortcut_button">Создать ярлык</string>
+	<string name="select_folder">Выбрать</string>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 19b742ab..0543fed8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,13 +35,14 @@ Special thanks to:\n
 	&#8226; <a href="https://github.com/SDLash3D">GitHub</a></string>
     <string name="about_button">About Xash3D Android</string>
     <string name="create_shortcut_button">Create mod shortcut</string>
-    <string name="select_folder">(select)</string>
+    <string name="select_folder">Select folder</string>
     
     <string name="text_tab1">Normal</string>
     <string name="text_tab2">Advanced</string>
     <string name="text_res_tittle2">Normal settings</string>
     <string name="text_res_tittle3">Advanced settings</string>
-    <string name="use_volume">Gamepad support off!</string>
-    <string name="no_volume">Gamepad support active!</string>
+    <string name="volume">Volume buttons mode</string>
+    <string name="use_volume">Default action</string>
+    <string name="no_volume">Use in game</string>
     <string name="folder">Set current folder</string>
 </resources>
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index 5c0e1036..92946fe4 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -10,6 +10,8 @@ import android.view.View;
 import android.content.Intent;
 import android.view.Window;
 import android.widget.EditText;
+import android.widget.TextView;
+
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.Button;
@@ -40,6 +42,7 @@ public class LauncherActivity extends Activity {
 	static EditText resPath;
 	static SharedPreferences mPref;
 	static Spinner pixelSpinner;
+	static TextView tvResPath;
 	String getDefaultPath()
 	{
 		File dir = Environment.getExternalStorageDirectory();
@@ -72,12 +75,12 @@ public class LauncherActivity extends Activity {
 	tabHost.addTab(tabSpec);
 
 	final String[] list = {
-	"RGBA8888",
-	"RGBA888",
-	"RGB565",
-	"RGBA5551",
-	"RGBA4444",
-	"RGB332"
+	"32 bit (RGBA8888)",
+	"24 bit (RGB888)",
+	"16 bit (RGB565)",
+	"15 bit (RGBA5551)",
+	"12 bit (RGBA4444)",
+	"8 bit (RGB332)"
 	};
 	pixelSpinner = (Spinner) findViewById(R.id.pixelSpinner);
 	ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, list);
@@ -117,10 +120,26 @@ public class LauncherActivity extends Activity {
 	useVolume = ( ToggleButton ) findViewById( R.id.useVolume );
 	useVolume.setChecked(mPref.getBoolean("usevolume",true));
 	resPath = ( EditText ) findViewById( R.id.cmdPath );
-	resPath.setText(mPref.getString("basedir", getDefaultPath()));
+	tvResPath = ( TextView ) findViewById( R.id.textView_path );
+	updatePath(mPref.getString("basedir", getDefaultPath()));
+	resPath.setOnFocusChangeListener( new View.OnFocusChangeListener()
+	
+	{
+		@Override
+		public void onFocusChange(View v, boolean hasFocus)
+		{
+			updatePath( resPath.getText().toString() );
+		}
+	} );
 	pixelSpinner.setSelection(mPref.getInt("pixelformat", 0));
 	}
 
+	void updatePath( String text )
+	{
+		tvResPath.setText(getResources().getString(R.string.text_res_path) + ":\n" + text );
+		resPath.setText(text);
+	
+	}
     public void startXash(View view)
     {
 	Intent intent = new Intent(this, XashActivity.class);
@@ -163,8 +182,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent resultData)
 		if (resultCode == RESULT_OK) {
 try{
 
-		resPath = ( EditText ) findViewById( R.id.cmdPath );
-		resPath.setText( resultData.getStringExtra("GetPath"));
+		if( resPath == null )
+		    return;
+		updatePath( resultData.getStringExtra("GetPath"));
 
 //	final List<String> paths = resultData.getData().getPathSegments();
 //			String[] parts = paths.get(1).split(":");