From a00f99e9cd1a0ba4e01288bf0fb01aafec53a2f9 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Thu, 6 Jun 2019 15:22:58 -0400
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/3047: Fix blank space for
 system edit text controls (https://github.com/mozilla-mobile/fenix/pull/3227)

---
 app/src/main/res/values/styles.xml                    | 2 +-
 app/src/main/res/xml/account_settings_preferences.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fda43f7927..48c0fda5c1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -53,7 +53,7 @@
     <style name="NormalTheme" parent="NormalThemeBase" />
 
     <style name="DialogStyle" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="android:background">?above</item>
+        <item name="android:colorBackground">?above</item>
         <item name="colorAccent">?accent</item>
         <item name="android:textColorPrimary">?primaryText</item>
     </style>
diff --git a/app/src/main/res/xml/account_settings_preferences.xml b/app/src/main/res/xml/account_settings_preferences.xml
index c9255ce296..13f329b0e1 100644
--- a/app/src/main/res/xml/account_settings_preferences.xml
+++ b/app/src/main/res/xml/account_settings_preferences.xml
@@ -8,17 +8,17 @@
             android:key="@string/pref_key_sync_now"
             android:title="@string/preferences_sync_now" />
 
-    <PreferenceCategory
+    <androidx.preference.PreferenceCategory
             android:key="@string/preferences_sync_category"
             android:title="@string/preferences_sync_category">
 
-        <CheckBoxPreference
+        <androidx.preference.CheckBoxPreference
                 android:key="@string/pref_key_sync_bookmarks"
                 android:defaultValue="true"
                 android:enabled="false"
                 android:title="@string/preferences_sync_bookmarks" />
 
-        <CheckBoxPreference
+        <androidx.preference.CheckBoxPreference
                 android:key="@string/pref_key_sync_history"
                 android:defaultValue="true"
                 android:enabled="false"
@@ -28,7 +28,7 @@
                 android:key="@string/pref_key_sync_device_name"
                 android:title="@string/preferences_sync_device_name" />
 
-    </PreferenceCategory>
+    </androidx.preference.PreferenceCategory>
 
     <androidx.preference.Preference
             android:key="@string/pref_key_sign_out"