From aede7a2bf603500a5d52c18bbb28c89c33406537 Mon Sep 17 00:00:00 2001
From: Jeremy Klein <jlklein@google.com>
Date: Fri, 14 Aug 2015 11:26:11 -0700
Subject: Remove the welcome wizard activity and add the EULA to the help
 screen.

---
 app/src/main/AndroidManifest.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/src/main/AndroidManifest.xml')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4bbe055..a1b6501 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,10 +64,14 @@
 		<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=".WizardActivity" 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>
 
 		<service android:name="org.connectbot.service.TerminalManager"
 			android:configChanges="keyboardHidden|orientation"
-- 
cgit v1.2.3