From 0943015416c68b053b1d734ace006613620b19be Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <4312191+fmeum@users.noreply.github.com>
Date: Sun, 3 Jan 2021 16:30:30 +0100
Subject: [PATCH] Show less obvious Autofill actions first (#1268)

Show Generate and Fill SMS OTP Autofill actions before the more
uninteresting (and expected) Search action.
---
 .../aps/util/autofill/Api30AutofillResponseBuilder.kt     | 8 ++++----
 .../aps/util/autofill/AutofillResponseBuilder.kt          | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt b/app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt
index 2b0d56a35..901fe46ea 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt
@@ -134,10 +134,6 @@ class Api30AutofillResponseBuilder(form: FillableForm) {
                     addDataset(it)
                 }
             }
-            makeSearchDataset(context, imeSpecs.getOrNull(datasetCount))?.let {
-                datasetCount++
-                addDataset(it)
-            }
             makeGenerateDataset(context, imeSpecs.getOrNull(datasetCount))?.let {
                 datasetCount++
                 addDataset(it)
@@ -146,6 +142,10 @@ class Api30AutofillResponseBuilder(form: FillableForm) {
                 datasetCount++
                 addDataset(it)
             }
+            makeSearchDataset(context, imeSpecs.getOrNull(datasetCount))?.let {
+                datasetCount++
+                addDataset(it)
+            }
             if (datasetCount == 0) return null
             setHeader(makeRemoteView(context, makeHeaderMetadata(formOrigin.getPrettyIdentifier(context, untrusted = true))))
             makeSaveInfo()?.let { setSaveInfo(it) }
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt
index eecfc81b9..1389713c7 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt
@@ -137,10 +137,6 @@ class AutofillResponseBuilder(form: FillableForm) {
                     addDataset(it)
                 }
             }
-            makeSearchDataset(context)?.let {
-                datasetCount++
-                addDataset(it)
-            }
             makeGenerateDataset(context)?.let {
                 datasetCount++
                 addDataset(it)
@@ -149,6 +145,10 @@ class AutofillResponseBuilder(form: FillableForm) {
                 datasetCount++
                 addDataset(it)
             }
+            makeSearchDataset(context)?.let {
+                datasetCount++
+                addDataset(it)
+            }
             if (datasetCount == 0) return null
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 setHeader(makeRemoteView(context, makeHeaderMetadata(formOrigin.getPrettyIdentifier(context, untrusted = true))))