get rid of consolidate operation

2017-09-22 04:26:12 +02:00
parent f413d77360
commit b814753b3b
13 changed files with 18 additions and 690 deletions
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -772,9 +772,6 @@
            android:name=".ui.LogDisplayActivity"
            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
            android:label="@string/title_log_display" />
-        <activity
-            android:name=".ui.ConsolidateDialogActivity"
-            android:theme="@style/Theme.Keychain.Transparent" />
        <activity
            android:name=".ui.PassphraseDialogActivity"
            android:theme="@style/Theme.Keychain.Transparent" />