From c0531ffa8202902e5b39d3be56687c2b3b858c89 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Thu, 10 Jun 2021 21:36:44 +0200
Subject: [PATCH] Update Android Components to 91.0.20210610143711. (#19946)

---
 app/src/debug/AndroidManifest.xml             |  3 +++
 .../fenix/autofill/AutofillSearchActivity.kt  | 20 +++++++++++++++++++
 .../mozilla/fenix/components/Components.kt    |  2 ++
 app/src/nightly/AndroidManifest.xml           |  3 +++
 buildSrc/src/main/java/AndroidComponents.kt   |  2 +-
 5 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/org/mozilla/fenix/autofill/AutofillSearchActivity.kt

diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 0b66b4956..2f48a82a5 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -28,6 +28,9 @@
             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"
diff --git a/app/src/main/java/org/mozilla/fenix/autofill/AutofillSearchActivity.kt b/app/src/main/java/org/mozilla/fenix/autofill/AutofillSearchActivity.kt
new file mode 100644
index 000000000..32b070f5b
--- /dev/null
+++ b/app/src/main/java/org/mozilla/fenix/autofill/AutofillSearchActivity.kt
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.autofill
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import mozilla.components.feature.autofill.AutofillConfiguration
+import mozilla.components.feature.autofill.ui.AbstractAutofillSearchActivity
+import org.mozilla.fenix.ext.components
+
+/**
+ * Activity responsible for letting the user manually search and pick credentials for auto-filling a
+ * third-party app.
+ */
+@RequiresApi(Build.VERSION_CODES.O)
+class AutofillSearchActivity : AbstractAutofillSearchActivity() {
+    override val configuration: AutofillConfiguration by lazy { components.autofillConfiguration }
+}
diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt
index 19738419b..7c124c1b5 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -23,6 +23,7 @@ import org.mozilla.fenix.Config
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.autofill.AutofillConfirmActivity
+import org.mozilla.fenix.autofill.AutofillSearchActivity
 import org.mozilla.fenix.autofill.AutofillUnlockActivity
 import org.mozilla.fenix.components.metrics.AppStartupTelemetry
 import org.mozilla.fenix.ext.settings
@@ -165,6 +166,7 @@ class Components(private val context: Context) {
             publicSuffixList = publicSuffixList,
             unlockActivity = AutofillUnlockActivity::class.java,
             confirmActivity = AutofillConfirmActivity::class.java,
+            searchActivity = AutofillSearchActivity::class.java,
             applicationName = context.getString(R.string.app_name),
             httpClient = core.client
         )
diff --git a/app/src/nightly/AndroidManifest.xml b/app/src/nightly/AndroidManifest.xml
index 3aaf3d6a2..4be64e9d9 100644
--- a/app/src/nightly/AndroidManifest.xml
+++ b/app/src/nightly/AndroidManifest.xml
@@ -12,6 +12,9 @@
             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"
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index 5a0ba0240..4ad2f5675 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "91.0.20210609190338"
+    const val VERSION = "91.0.20210610143711"
 }