1 files changed, 16 insertions, 72 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1cbe76a9..15d6447e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,36 +34,24 @@
     tools:targetApi="s">
 
     <activity
-      android:name=".ui.passwords.PasswordStore"
-      android:configChanges="orientation|screenSize"
-      android:exported="false" />
-
-    <activity
-      android:name=".ui.onboarding.activity.OnboardingActivity"
-      android:configChanges="orientation|screenSize"
-      android:exported="false" />
-
-    <activity
-      android:name=".ui.proxy.ProxySelectorActivity"
-      android:exported="false"
-      android:label="@string/activity_proxy_label"
-      android:windowSoftInputMode="adjustResize" />
-
-    <activity
-      android:name=".ui.crypto.DecryptActivity"
-      android:exported="false" />
-
-    <activity
       android:name=".ui.main.LaunchActivity"
       android:configChanges="orientation|screenSize"
       android:exported="true"
-      android:theme="@style/NoBackgroundThemeM3">
+      android:theme="@style/NoActionBarThemeM3">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
 
+    <!-- ponytail: rotation must not cancel store and git work in lifecycleScope; theme or locale changes still recreate. -->
+    <activity
+      android:name=".ui.main.MainActivity"
+      android:configChanges="orientation|screenSize"
+      android:exported="false"
+      android:theme="@style/NoActionBarThemeM3"
+      android:windowSoftInputMode="adjustResize" />
+
     <activity
       android:name="com.journeyapps.barcodescanner.CaptureActivity"
       android:clearTaskOnLaunch="true"
@@ -73,35 +61,6 @@
       android:windowSoftInputMode="stateAlwaysHidden"
       tools:node="replace" />
 
-    <activity
-      android:name=".ui.git.config.GitServerConfigActivity"
-      android:exported="false"
-      android:label="@string/title_activity_git_clone"
-      android:windowSoftInputMode="adjustResize" />
-
-    <activity
-      android:name=".ui.git.config.GitConfigActivity"
-      android:exported="false"
-      android:label="@string/title_activity_git_config"
-      android:windowSoftInputMode="adjustResize" />
-
-    <activity
-      android:name=".ui.git.log.GitLogActivity"
-      android:exported="false"
-      android:label="@string/title_activity_git_log" />
-
-    <activity
-      android:name=".ui.settings.SettingsActivity"
-      android:exported="false"
-      android:label="@string/action_settings"
-      android:parentActivityName=".ui.passwords.PasswordStore" />
-
-    <activity
-      android:name=".ui.crypto.PasswordCreationActivity"
-      android:exported="false"
-      android:label="@string/new_password_title"
-      android:windowSoftInputMode="adjustResize" />
-
     <service
       android:name=".util.services.ClipboardService"
       android:exported="false"
@@ -124,21 +83,11 @@
         android:resource="@xml/oreo_autofill_service" />
     </service>
 
-    <activity
-      android:name=".ui.folderselect.SelectFolderActivity"
-      android:exported="false" />
-    <activity
-      android:name=".ui.sshkeygen.SshKeyImportActivity"
-      android:exported="false"
-      android:theme="@style/NoBackgroundThemeM3"
-      android:windowSoftInputMode="adjustResize" />
-    <activity
-      android:name=".ui.sshkeygen.SshKeyGenActivity"
-      android:exported="false"
-      android:label="@string/pref_ssh_keygen_title"
-      android:windowSoftInputMode="adjustResize" />
+    <!-- ponytail: rotation, resizing and keyboard changes must not cancel a fill in progress;
+         other recreations (theme, locale) cancel it. -->
     <activity
       android:name=".ui.autofill.AutofillDecryptActivity"
+      android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden"
       android:exported="false"
       android:theme="@style/NoBackgroundThemeM3" />
     <activity
@@ -147,24 +96,19 @@
       android:exported="false"
       android:theme="@style/DialogLikeThemeM3"
       android:windowSoftInputMode="adjustNothing" />
+    <!-- ponytail: rotation must not cancel a save running in lifecycleScope, as in MainActivity. -->
     <activity
       android:name=".ui.autofill.AutofillSaveActivity"
+      android:configChanges="orientation|screenSize"
       android:exported="false"
-      android:theme="@style/NoBackgroundThemeM3" />
+      android:theme="@style/NoActionBarThemeM3"
+      android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".ui.autofill.AutofillPublisherChangedActivity"
       android:configChanges="orientation|keyboardHidden"
       android:exported="false"
       android:theme="@style/DialogLikeThemeM3"
       android:windowSoftInputMode="adjustNothing" />
-    <activity
-      android:name=".ui.pgp.PGPKeyImportActivity"
-      android:theme="@style/NoBackgroundThemeM3" />
-    <activity
-      android:name=".ui.pgp.PGPKeyListActivity"
-      android:exported="false"
-      android:label="@string/activity_label_pgp_key_manager"
-      android:parentActivityName=".ui.settings.SettingsActivity" />
   </application>
 
   <queries>