diff options
| author | Kenny Root <kenny@the-b.org> | 2015-08-14 17:28:11 -0500 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-08-14 17:28:11 -0500 |
| commit | a04326017c5e75e96ad0e3b4d83c044017a01d54 (patch) | |
| tree | 04221cdf846ab6043e342476f7c194a16b54964e /app/src/main/AndroidManifest.xml | |
| parent | 7de5ce146e721cbc7296c8110f6bed26d9eae8e2 (diff) | |
| parent | b0a0047c405e2b549e9a5ed8e7529ae61542ac72 (diff) | |
| download | connectbot-a04326017c5e75e96ad0e3b4d83c044017a01d54.tar.gz connectbot-a04326017c5e75e96ad0e3b4d83c044017a01d54.tar.bz2 connectbot-a04326017c5e75e96ad0e3b4d83c044017a01d54.zip | |
Merge pull request #130 from jklein24/nointro
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.xml | 6 |
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" |