Merge pull request #197 from kruton/parent-activities

Add parent activities for all activities

1 files changed, 122 insertions, 35 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f43a428..0f9bd76 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,60 +41,147 @@
 		android:backupAgent=".service.BackupAgent"
 		android:killAfterRestore="true">
 
-		<activity android:name=".HostListActivity" android:launchMode="singleTop">
+		<activity
+			android:name=".HostListActivity"
+			android:launchMode="singleTop">
 			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
+				<action android:name="android.intent.action.MAIN"/>
+				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 			<intent-filter>
-				<action android:name="android.intent.action.CREATE_SHORTCUT" />
-				<category android:name="android.intent.category.DEFAULT" />
+				<action android:name="android.intent.action.CREATE_SHORTCUT"/>
+				<category android:name="android.intent.category.DEFAULT"/>
 			</intent-filter>
 			<intent-filter>
-				<action android:name="android.intent.action.PICK" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<data android:scheme="ssh" />
-				<data android:scheme="telnet" />
-				<data android:scheme="local" />
+				<action android:name="android.intent.action.PICK"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+
+				<data android:scheme="ssh"/>
+				<data android:scheme="telnet"/>
+				<data android:scheme="local"/>
 			</intent-filter>
 		</activity>
 
-		<activity android:name=".PubkeyListActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".GeneratePubkeyActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".HostEditorActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".PortForwardListActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".SettingsActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".HelpActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".HelpTopicActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".ColorsActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".EulaActivity"	android:parentActivityName=".HelpActivity"
-			  android:configChanges="keyboardHidden|orientation" >
-			<meta-data android:name="android.support.PARENT_ACTIVITY"
-				   android:value="org.connectbot.HelpActivity" />
+		<activity
+			android:name=".PubkeyListActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_pubkey_list">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".GeneratePubkeyActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_pubkey_generate">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.PubkeyListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".HostEditorActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_host_editor">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".PortForwardListActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_port_forwards_list">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".SettingsActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_settings">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".HelpActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_help">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".HelpTopicActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_help">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HelpActivity"/>
 		</activity>
 
-		<service android:name="org.connectbot.service.TerminalManager"
+		<activity
+			android:name=".ColorsActivity"
 			android:configChanges="keyboardHidden|orientation"
-			android:description="@string/service_desc" />
+			android:label="@string/title_colors">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
 
-		<activity android:name=".ConsoleActivity" android:configChanges="keyboardHidden|orientation"
-			android:theme="@style/Theme.AppCompat" android:windowSoftInputMode="stateAlwaysVisible|adjustResize"
-			android:launchMode="singleTop" android:hardwareAccelerated="false">
+		<activity
+			android:name=".EulaActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/terms_and_conditions">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HelpActivity"/>
+		</activity>
+
+		<service
+			android:name="org.connectbot.service.TerminalManager"
+			android:configChanges="keyboardHidden|orientation"
+			android:description="@string/service_desc"/>
+
+		<activity
+			android:name=".ConsoleActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:hardwareAccelerated="false"
+			android:launchMode="singleTop"
+			android:theme="@style/Theme.AppCompat"
+			android:windowSoftInputMode="stateAlwaysVisible|adjustResize">
 			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:scheme="ssh" />
-				<data android:scheme="telnet" />
-				<data android:scheme="local" />
+				<action android:name="android.intent.action.VIEW"/>
+
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+
+				<data android:scheme="ssh"/>
+				<data android:scheme="telnet"/>
+				<data android:scheme="local"/>
 				<!-- format:  ssh://user@host:port/#nickname  -->
 				<!-- format:  telnet://host:port/#nickname  -->
 				<!-- format:  local://  -->
 			</intent-filter>
 		</activity>
 
-		<meta-data android:name="com.google.android.backup.api_key"
-			android:value="AEdPqrEAAAAIDlFz9nSUr2g0gSytW0t2cNnYAGHDkptlVohsBA" />
+		<meta-data
+			android:name="com.google.android.backup.api_key"
+			android:value="AEdPqrEAAAAIDlFz9nSUr2g0gSytW0t2cNnYAGHDkptlVohsBA"/>
 
 	</application>
 </manifest>