fix #9, fix #10

farom57 · Aug 23, 2014 · e8ab4c1 · e8ab4c1
1 parent 7e6a852
commit e8ab4c1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -17,11 +17,11 @@
         android:theme="@style/AppTheme" >
         <activity
             android:name="farom.astroid.ConnectionActivity"
-            android:label="@string/title_activity_connection"
+            android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:logo="@drawable/icon_connect"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden" android:description="@string/title_activity_connection">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -30,20 +30,20 @@
         </activity>
         <activity
             android:name="farom.astroid.MotionActivity"
-            android:label="@string/title_activity_motion"
+            android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
-            android:logo="@drawable/icon_move">
+            android:logo="@drawable/icon_move" android:description="@string/title_activity_motion">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="farom.astroid.ConnectionActivity" />
         </activity>
         <activity
             android:name="farom.astroid.GenericActivity"
-            android:label="@string/title_activity_generic"
+            android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:logo="@drawable/icon_gen"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait" android:description="@string/title_activity_generic">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="farom.astroid.ConnectionActivity" />

diff --git a/src/farom/astroid/ConnectionActivity.java b/src/farom/astroid/ConnectionActivity.java
@@ -15,6 +15,7 @@
 import laazotea.indi.client.INDIServerConnection;
 import laazotea.indi.client.INDIServerConnectionListener;
 import android.annotation.SuppressLint;
+import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -218,6 +219,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
 			moveItem.setVisible(false);
 
 		}
+
+		ActionBar ab = getActionBar();
+		ab.setSubtitle(R.string.title_activity_connection);
 
 		return true;
 	}

diff --git a/src/farom/astroid/GenericActivity.java b/src/farom/astroid/GenericActivity.java
@@ -61,6 +61,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
 		// hide the item for the current activity
 		MenuItem genericItem = menu.findItem(R.id.menu_generic);
 		genericItem.setVisible(false);
+
+		ActionBar ab = getActionBar();
+		ab.setSubtitle(R.string.title_activity_generic);
 
 		return true;
 	}

diff --git a/src/farom/astroid/MotionActivity.java b/src/farom/astroid/MotionActivity.java
@@ -18,6 +18,7 @@
 import laazotea.indi.client.INDISwitchElement;
 import laazotea.indi.client.INDISwitchProperty;
 import laazotea.indi.client.INDIValueException;
+import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -136,6 +137,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
 		// hide the menu item for the current activity
 		MenuItem motionItem = menu.findItem(R.id.menu_move);
 		motionItem.setVisible(false);
+
+		ActionBar ab = getActionBar();
+		ab.setSubtitle(R.string.title_activity_motion);
+
 		return true;
 	}
 
@@ -746,6 +751,7 @@ public void onClick(View v) {
 
 	@Override
 	protected void onDestroy() {
+		super.onDestroy();
 		ConnectionActivity.getInstance().unRegisterPermanentConnectionListener(this);
 	}