Add computer name as a subtitle to the connection activity.

Change-Id: I3df33faef2004107cd2a806e536efb63517a18c7

1 files changed, 11 insertions, 4 deletions

diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
index 377f596d13f5..7a5281da08f4 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
@@ -24,6 +24,7 @@ public class ComputerConnectionActivity extends SherlockFragmentActivity {
         super.onCreate(savedInstanceState);
 
         setUpHomeButton();
+        setUpTitle();
         setUpFragment();
     }
 
@@ -31,17 +32,23 @@ public class ComputerConnectionActivity extends SherlockFragmentActivity {
         getSupportActionBar().setHomeButtonEnabled(true);
     }
 
-    private void setUpFragment() {
-        Server aComputer = extractReceivedComputer();
-        Fragment aFragment = ComputerConnectionFragment.newInstance(aComputer);
+    private void setUpTitle() {
+        String aComputerName = extractReceivedComputer().getName();
 
-        FragmentOperator.addFragment(this, aFragment);
+        getSupportActionBar().setSubtitle(aComputerName);
     }
 
     private Server extractReceivedComputer() {
         return getIntent().getParcelableExtra(Intents.Extras.SERVER);
     }
 
+    private void setUpFragment() {
+        Server aComputer = extractReceivedComputer();
+        Fragment aFragment = ComputerConnectionFragment.newInstance(aComputer);
+
+        FragmentOperator.addFragment(this, aFragment);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem aMenuItem) {
         switch (aMenuItem.getItemId()) {