From e27614703a9f1ce2cd2132fa2aa4c16cfa892507 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Mon, 13 Jan 2020 11:53:38 +0100
Subject: [PATCH] Fixes L10n with the prompt widget (#2607)

---
 app/src/main/res/layout/prompt_auth.xml   |  4 ++--
 app/src/main/res/layout/prompt_dialog.xml |  7 +------
 app/src/main/res/values/dimen.xml         |  2 +-
 app/src/main/res/values/styles.xml        | 11 ++++++++++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/prompt_auth.xml b/app/src/main/res/layout/prompt_auth.xml
index 37bdb2814..4f9b0f21c 100644
--- a/app/src/main/res/layout/prompt_auth.xml
+++ b/app/src/main/res/layout/prompt_auth.xml
@@ -132,8 +132,8 @@
 
                 <CheckBox
                     android:id="@+id/showPasswordCheckbox"
-                    android:layout_marginStart="5dp"
-                    style="@style/settingsSwitch" />
+                    style="@style/checkbox"
+                    android:layout_marginStart="5dp"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/prompt_dialog.xml b/app/src/main/res/layout/prompt_dialog.xml
index 9ee39c8ad..05bc6cc87 100644
--- a/app/src/main/res/layout/prompt_dialog.xml
+++ b/app/src/main/res/layout/prompt_dialog.xml
@@ -93,12 +93,7 @@
             android:layout_above="@+id/buttonsLayout">
             <CheckBox
                 android:id="@+id/checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:button="@drawable/checkbox"
-                android:layout_gravity="center_horizontal"
-                android:textSize="@dimen/text_medium_size"
-                android:text="Checkbox"
+                style="@style/checkbox"
                 tools:text="Checkbox" />
         </FrameLayout>
 
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 6c31bfc2d..c987b08ab 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -243,7 +243,7 @@
 
     <!-- Prompt dialog -->
     <dimen name="prompt_dialog_width">450dp</dimen>
-    <dimen name="prompt_dialog_height">365dp</dimen>
+    <dimen name="prompt_dialog_height">375dp</dimen>
     <dimen name="prompt_dialog_padding_top">20dp</dimen>
     <dimen name="prompt_dialog_padding_bottom">42dp</dimen>
     <dimen name="prompt_dialog_padding_sides">64dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 589191dfc..80a8c010e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -297,7 +297,7 @@
 
     <style name="settingsSwitch">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
         <item name="android:switchMinWidth">0dp</item>
         <item name="android:textOff">""</item>
         <item name="android:textOn">""</item>
@@ -305,6 +305,15 @@
         <item name="android:track">@drawable/switch_track</item>
     </style>
 
+    <style name="checkbox">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:button">@drawable/checkbox</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:textSize">@dimen/text_medium_size</item>
+        <item name="android:paddingStart">5dp</item>
+    </style>
+
     <style name="settingsHelpButton">
         <item name="android:layout_width">20dp</item>
         <item name="android:layout_height">20dp</item>