aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorJeremy Klein <jlklein@google.com>2015-08-14 11:26:11 -0700
committerJeremy Klein <jlklein@google.com>2015-08-14 11:27:55 -0700
commitaede7a2bf603500a5d52c18bbb28c89c33406537 (patch)
tree39d35476962b21245fb5c17d5c43724e877185ed /app/src/main/AndroidManifest.xml
parent7de5ce146e721cbc7296c8110f6bed26d9eae8e2 (diff)
downloadconnectbot-aede7a2bf603500a5d52c18bbb28c89c33406537.tar.gz
connectbot-aede7a2bf603500a5d52c18bbb28c89c33406537.tar.bz2
connectbot-aede7a2bf603500a5d52c18bbb28c89c33406537.zip
Remove the welcome wizard activity and add the EULA to the help screen.
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
-rw-r--r--app/src/main/AndroidManifest.xml6
1 files changed, 5 insertions, 1 deletions
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"