From d6355555769539ea2a87ed6aa1e8420172a01a3f Mon Sep 17 00:00:00 2001
From: Matt Portune <59324545+mportune-bw@users.noreply.github.com>
Date: Fri, 3 Apr 2020 09:57:04 -0400
Subject: [PATCH] Tweaks to autofill tile naming & fixed missing plus icon
 (#819)

---
 src/Android/Resources/values/strings.xml     | 4 ++--
 src/Android/Tiles/AutofillTileService.cs     | 2 +-
 src/App/Pages/Vault/AutofillCiphersPage.xaml | 1 +
 src/App/Resources/AppResources.resx          | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Android/Resources/values/strings.xml b/src/Android/Resources/values/strings.xml
index 53c6195b6..5e489f56f 100644
--- a/src/Android/Resources/values/strings.xml
+++ b/src/Android/Resources/values/strings.xml
@@ -16,8 +16,8 @@
   <string name="PasswordGenerator">
     Password Generator
   </string>
-  <string name="ScanAndFill">
-    Scan &amp; Fill
+  <string name="AutoFillTile">
+    Auto-fill
   </string>
   <string name="SelfHostedServerUrl">
     Self-hosted server URL
diff --git a/src/Android/Tiles/AutofillTileService.cs b/src/Android/Tiles/AutofillTileService.cs
index 71db23805..305afce37 100644
--- a/src/Android/Tiles/AutofillTileService.cs
+++ b/src/Android/Tiles/AutofillTileService.cs
@@ -12,7 +12,7 @@ using Java.Lang;
 
 namespace Bit.Droid.Tile
 {
-    [Service(Permission = Manifest.Permission.BindQuickSettingsTile, Label = "@string/ScanAndFill",
+    [Service(Permission = Manifest.Permission.BindQuickSettingsTile, Label = "@string/AutoFillTile",
         Icon = "@drawable/shield")]
     [IntentFilter(new string[] { ActionQsTile })]
     [Register("com.x8bit.bitwarden.AutofillTileService")]
diff --git a/src/App/Pages/Vault/AutofillCiphersPage.xaml b/src/App/Pages/Vault/AutofillCiphersPage.xaml
index 8a310eca3..6465d89d4 100644
--- a/src/App/Pages/Vault/AutofillCiphersPage.xaml
+++ b/src/App/Pages/Vault/AutofillCiphersPage.xaml
@@ -96,6 +96,7 @@
         </ContentView>
         <Button
             x:Name="_fab"
+            Image="plus.png"
             Clicked="AddButton_Clicked"
             Style="{StaticResource btn-fab}"
             AbsoluteLayout.LayoutFlags="PositionProportional"
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 08f25c932..f819229ff 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1626,7 +1626,7 @@
     <value>Attachment saved successfully</value>
   </data>
   <data name="AutofillTileAccessibilityRequired" xml:space="preserve">
-    <value>Please enable "Auto-fill Accessibility Service" from Bitwarden Settings to use the Scan &amp; Fill tile.</value>
+    <value>Please enable "Auto-fill Accessibility Service" from Bitwarden Settings to use the Auto-fill tile.</value>
   </data>
   <data name="AutofillTileUriNotFound" xml:space="preserve">
     <value>No password fields detected</value>