diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/AndroidManifest.xml | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml index 4fabf7432..b1fbcf555 100644 --- a/OpenPGP-Keychain/src/main/AndroidManifest.xml +++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml @@ -61,7 +61,7 @@ android:theme="@style/KeychainTheme" android:label="@string/app_name"> <activity - android:name=".ui.KeyListPublicActivity" + android:name=".ui.KeyListActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/app_name" android:launchMode="singleTop"> @@ -72,12 +72,6 @@ </intent-filter> </activity> <activity - android:name=".ui.KeyListSecretActivity" - android:configChanges="orientation|screenSize|keyboardHidden|keyboard" - android:label="@string/title_manage_secret_keys" - android:launchMode="singleTop"> - </activity> - <activity android:name=".ui.EditKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_edit_key" @@ -86,19 +80,19 @@ android:name=".ui.ViewKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_key_details" - android:parentActivityName=".ui.KeyListPublicActivity"> + android:parentActivityName=".ui.KeyListActivity"> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".ui.KeyListPublicActivity" /> + android:value=".ui.KeyListActivity" /> </activity> <activity android:name=".ui.ViewKeyActivityJB" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_key_details" - android:parentActivityName=".ui.KeyListPublicActivity"> + android:parentActivityName=".ui.KeyListActivity"> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".ui.KeyListPublicActivity" /> + android:value=".ui.KeyListActivity" /> </activity> <activity android:name=".ui.SelectPublicKeyActivity" @@ -438,4 +432,4 @@ <!-- android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" /> --> </application> -</manifest>
\ No newline at end of file +</manifest> |