From 7873d0554109560c7ea9dfeeac3d3783e827650b Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Sun, 20 Dec 2015 13:23:30 +0100
Subject: [PATCH] DroidFish: Include engine name in UCI Options activity title.

---
 DroidFish/AndroidManifest.xml                                  | 1 -
 DroidFish/src/org/petero/droidfish/DroidFish.java              | 1 +
 DroidFish/src/org/petero/droidfish/activities/EditOptions.java | 3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/DroidFish/AndroidManifest.xml b/DroidFish/AndroidManifest.xml
index 5aadeda..a7b2c7b 100644
--- a/DroidFish/AndroidManifest.xml
+++ b/DroidFish/AndroidManifest.xml
@@ -118,7 +118,6 @@
                   android:label="@string/cpu_warning_title">
         </activity>
         <activity android:name=".activities.EditOptions"
-                  android:label="@string/edit_options_title"
                   android:configChanges="orientation">
         </activity>
         </application>
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index 415ed4f..5ff1407 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -2881,6 +2881,7 @@ public class DroidFish extends Activity implements GUIInterface {
         UCIOptions uciOpts = ctrl.getUCIOptions();
         if (uciOpts != null) {
             i.putExtra("org.petero.droidfish.ucioptions", uciOpts);
+            i.putExtra("org.petero.droidfish.enginename", engineTitleText.getText());
             startActivityForResult(i, RESULT_EDITOPTIONS);
         }
     }
diff --git a/DroidFish/src/org/petero/droidfish/activities/EditOptions.java b/DroidFish/src/org/petero/droidfish/activities/EditOptions.java
index 333868e..d8ccc0f 100644
--- a/DroidFish/src/org/petero/droidfish/activities/EditOptions.java
+++ b/DroidFish/src/org/petero/droidfish/activities/EditOptions.java
@@ -51,6 +51,7 @@ import android.widget.ToggleButton;
 /** Edit UCI options. */
 public class EditOptions extends Activity {
     private UCIOptions uciOpts = null;
+    private String engineName = "";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -61,6 +62,7 @@ public class EditOptions extends Activity {
 
         Intent i = getIntent();
         uciOpts = (UCIOptions)i.getSerializableExtra("org.petero.droidfish.ucioptions");
+        engineName = (String)i.getSerializableExtra("org.petero.droidfish.enginename");
         if (uciOpts != null) {
             initUI();
         } else {
@@ -87,6 +89,7 @@ public class EditOptions extends Activity {
     private final void initUI() {
         setContentView(R.layout.editoptions);
         Util.overrideFonts(findViewById(android.R.id.content));
+        setTitle(getString(R.string.edit_options_title) + ": " + engineName);
 
         LinearLayout content = (LinearLayout)findViewById(R.id.eo_content);
         Button okButton = (Button)findViewById(R.id.eo_ok);