From 846274b7cdc48e567b4f60abf10da9f633a82bdb Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Mon, 30 Aug 2021 18:12:48 +0200
Subject: [PATCH] Enable Android Autofill support in all build types.

---
 app/build.gradle                              |  1 +
 app/src/beta/AndroidManifest.xml              | 44 -------------------
 app/src/debug/AndroidManifest.xml             | 22 ----------
 app/src/main/AndroidManifest.xml              | 21 +++++++++
 .../java/org/mozilla/fenix/FeatureFlags.kt    |  8 ----
 .../fragment/SavedLoginsAuthFragment.kt       |  5 ---
 app/src/nightly/AndroidManifest.xml           | 21 ---------
 7 files changed, 22 insertions(+), 100 deletions(-)
 delete mode 100644 app/src/beta/AndroidManifest.xml

diff --git a/app/build.gradle b/app/build.gradle
index 3d488163e..a3663fc33 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -171,6 +171,7 @@ android {
         }
         beta {
             java.srcDirs = ['src/migration/java']
+            manifest.srcFile "src/migration/AndroidManifest.xml"
         }
         release {
             java.srcDirs = ['src/migration/java']
diff --git a/app/src/beta/AndroidManifest.xml b/app/src/beta/AndroidManifest.xml
deleted file mode 100644
index f98b6fa2f..000000000
--- a/app/src/beta/AndroidManifest.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.mozilla.fenix"
-    android:sharedUserId="${sharedUserId}">
-    <application
-        android:name="org.mozilla.fenix.MigratingFenixApplication"
-        tools:replace="android:name">
-
-        <activity android:name=".autofill.AutofillUnlockActivity"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-
-        <activity android:name=".autofill.AutofillConfirmActivity"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-
-        <activity android:name=".autofill.AutofillSearchActivity"
-            android:exported="false"
-            android:theme="@style/DialogActivityTheme" />
-
-        <service
-            android:name=".autofill.AutofillService"
-            android:label="@string/app_name"
-            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.autofill.AutofillService"/>
-            </intent-filter>
-        </service>
-
-        <!-- Overriding the alias of the main manifest to route app launches through our
-             MigrationDecisionActivity which will show the migration screen before launching
-             into the app if needed. -->
-        <activity-alias
-            android:name="${applicationId}.App"
-            android:targetActivity="org.mozilla.fenix.MigrationDecisionActivity"
-            tools:replace="android:targetActivity" />
-
-        <activity
-            android:name="org.mozilla.fenix.MigrationDecisionActivity"
-            android:exported="false" />
-
-        <service android:name="org.mozilla.fenix.MigrationService" />
-    </application>
-</manifest>
\ No newline at end of file
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index e46288934..2669e9ce9 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -19,28 +19,6 @@
     <application
             tools:replace="android:name"
             android:name="org.mozilla.fenix.DebugFenixApplication">
-
-        <activity android:name=".autofill.AutofillUnlockActivity"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-
-        <activity android:name=".autofill.AutofillConfirmActivity"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-
-        <activity android:name=".autofill.AutofillSearchActivity"
-            android:exported="false"
-            android:theme="@style/DialogActivityTheme" />
-
-        <service
-            android:name=".autofill.AutofillService"
-            android:label="@string/app_name"
-            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.autofill.AutofillService"/>
-            </intent-filter>
-        </service>
-
     </application>
 
 </manifest>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cdf7cfe2d..ca1a4216d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -245,6 +245,27 @@
         <activity android:name=".settings.account.AuthIntentReceiverActivity"
             android:exported="false" />
 
+        <activity android:name=".autofill.AutofillUnlockActivity"
+            android:exported="false"
+            android:theme="@style/Theme.AppCompat.Translucent" />
+
+        <activity android:name=".autofill.AutofillConfirmActivity"
+            android:exported="false"
+            android:theme="@style/Theme.AppCompat.Translucent" />
+
+        <activity android:name=".autofill.AutofillSearchActivity"
+            android:exported="false"
+            android:theme="@style/DialogActivityTheme" />
+
+        <service
+            android:name=".autofill.AutofillService"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.autofill.AutofillService"/>
+            </intent-filter>
+        </service>
+
         <service android:name=".media.MediaSessionService"
             android:exported="false" />
 
diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 1b6412354..b6b394a96 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -59,14 +59,6 @@ object FeatureFlags {
      */
     val inactiveTabs = Config.channel.isNightlyOrDebug
 
-    /**
-     * Enables support for Android Autofill.
-     *
-     * In addition to toggling this flag, matching entries in the Android Manifest of the build
-     * type need to present.
-     */
-    val androidAutofill = Config.channel.isNightlyOrDebug || Config.channel.isBeta
-
     /**
      * Enables showing the home screen behind the search dialog
      */
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt
index b139a53ec..339ad11cf 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsAuthFragment.kt
@@ -25,7 +25,6 @@ import kotlinx.coroutines.launch
 import mozilla.components.feature.autofill.preference.AutofillPreference
 import mozilla.components.service.fxa.SyncEngine
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.components
@@ -102,10 +101,6 @@ class SavedLoginsAuthFragment : PreferenceFragmentCompat() {
 
         requirePreference<AutofillPreference>(R.string.pref_key_android_autofill).apply {
             update()
-
-            if (!FeatureFlags.androidAutofill) {
-                isVisible = false
-            }
         }
 
         requirePreference<Preference>(R.string.pref_key_login_exceptions).apply {
diff --git a/app/src/nightly/AndroidManifest.xml b/app/src/nightly/AndroidManifest.xml
index c155b1461..5fdb32de4 100644
--- a/app/src/nightly/AndroidManifest.xml
+++ b/app/src/nightly/AndroidManifest.xml
@@ -4,27 +4,6 @@
 
     <application>
 
-        <activity android:name=".autofill.AutofillUnlockActivity"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-
-        <activity android:name=".autofill.AutofillConfirmActivity"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-
-        <activity android:name=".autofill.AutofillSearchActivity"
-            android:exported="false" />
-
-        <service
-            android:name=".autofill.AutofillService"
-            android:label="@string/app_name"
-            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.autofill.AutofillService"/>
-            </intent-filter>
-        </service>
-
-
         <service android:name=".customtabs.CustomTabsService">
             <!-- Trusted Web Activities are currently only supported in nightly. -->
             <intent-filter tools:node="removeAll" />