From 09d1dba133050ebf4af004e04f8fa0c3e7ab6836 Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Thu, 3 Sep 2020 09:47:31 -0700
Subject: [PATCH] For #14679 For #14676 - Dismiss MP Migration tip, init in
 disabled state

---
 .../providers/MasterPasswordTipProvider.kt    | 22 ++++++++++++++++---
 .../main/res/layout/fragment_edit_login.xml   |  4 ++--
 app/src/main/res/values/strings.xml           |  4 ++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
index e578f90fa..269e0ca39 100644
--- a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
@@ -92,7 +92,10 @@ class MasterPasswordTipProvider(
 
         val passwordErrorText = context.getString(R.string.mp_dialog_error_transfer_saved_logins)
         val migrationContinueButton =
-            dialogView.findViewById<MaterialButton>(R.id.migration_continue)
+            dialogView.findViewById<MaterialButton>(R.id.migration_continue).apply {
+                alpha = HALF_OPACITY
+                isEnabled = false
+            }
         val passwordView = dialogView.findViewById<TextInputEditText>(R.id.password_field)
         val passwordLayout =
             dialogView.findViewById<TextInputLayout>(R.id.password_text_input_layout)
@@ -179,7 +182,7 @@ class MasterPasswordTipProvider(
         dialogView.findViewById<MaterialButton>(R.id.positive_button).apply {
             text = context.getString(R.string.mp_dialog_close_transfer)
             setOnClickListener {
-                tip?.let { dismissTip(it) }
+                dismissMPTip()
                 dialog.dismiss()
             }
         }
@@ -212,8 +215,21 @@ class MasterPasswordTipProvider(
         }
     }
 
+    private fun dismissMPTip() {
+        tip?.let {
+            context.metrics.track(Event.TipClosed(it.identifier))
+
+            context.components.settings.preferences
+                .edit()
+                .putBoolean(it.identifier, false)
+                .apply()
+
+            dismissTip(it)
+        }
+    }
+
     private fun showSuccessDialog() {
-        tip?.let { dismissTip(it) }
+        dismissMPTip()
 
         context.metrics.track(Event.MasterPasswordMigrationSuccess)
 
diff --git a/app/src/main/res/layout/fragment_edit_login.xml b/app/src/main/res/layout/fragment_edit_login.xml
index 9c5a6373f..f6dcdbaff 100644
--- a/app/src/main/res/layout/fragment_edit_login.xml
+++ b/app/src/main/res/layout/fragment_edit_login.xml
@@ -137,7 +137,7 @@
         android:layout_marginTop="3dp"
         android:layout_marginBottom="10dp"
         android:background="@null"
-        android:contentDescription="@string/saved_login_copy_username"
+        android:contentDescription="@string/saved_login_clear_username"
         app:tint="@color/saved_login_clear_edit_text_tint"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/inputLayoutUsername"
@@ -219,7 +219,7 @@
         android:layout_width="48dp"
         android:layout_height="30dp"
         android:background="@null"
-        android:contentDescription="@string/saved_logins_copy_password"
+        android:contentDescription="@string/saved_logins_clear_password"
         app:tint="@color/saved_login_clear_edit_text_tint"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/revealPasswordButton"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7c643612..3fcf9cfc0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1344,8 +1344,12 @@
     <string name="logins_site_copied">Site copied to clipboard</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a password in logins-->
     <string name="saved_logins_copy_password">Copy password</string>
+    <!-- Content Description (for screenreaders etc) read for the button to clear a password while editing a login-->
+    <string name="saved_logins_clear_password">Clear password</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a username in logins -->
     <string name="saved_login_copy_username">Copy username</string>
+    <!-- Content Description (for screenreaders etc) read for the button to clear a username while editing a login -->
+    <string name="saved_login_clear_username">Clear username</string>
     <!-- Content Description (for screenreaders etc) read for the button to copy a site in logins -->
     <string name="saved_login_copy_site">Copy site</string>
     <!-- Content Description (for screenreaders etc) read for the button to open a site in logins -->