From 1f108f3c88ba18fe7fbd8f2324cd9c8485e2c4fc Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 10 Jul 2019 15:30:53 -0700
Subject: [PATCH] For #3806 - Adds corner radius to QAB and dialogs

---
 .../mozilla/fenix/quickactionsheet/QuickActionUIView.kt  | 1 -
 app/src/main/res/layout/component_quick_action_sheet.xml | 9 ++++++---
 app/src/main/res/layout/fragment_browser.xml             | 6 +++---
 app/src/main/res/layout/layout_quick_action_sheet.xml    | 3 ++-
 app/src/main/res/values/styles.xml                       | 1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionUIView.kt b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionUIView.kt
index f892f2fde..9e1734360 100644
--- a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionUIView.kt
@@ -16,7 +16,6 @@ import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.fragment_browser.*
 import kotlinx.android.synthetic.main.layout_quick_action_sheet.*
 import kotlinx.android.synthetic.main.layout_quick_action_sheet.view.*
-import kotlinx.android.synthetic.main.onboarding_privacy_notice.view.*
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.components
diff --git a/app/src/main/res/layout/component_quick_action_sheet.xml b/app/src/main/res/layout/component_quick_action_sheet.xml
index 25ba5300e..cecb0b374 100644
--- a/app/src/main/res/layout/component_quick_action_sheet.xml
+++ b/app/src/main/res/layout/component_quick_action_sheet.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.mozilla.fenix.quickactionsheet.QuickActionSheet
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<org.mozilla.fenix.quickactionsheet.QuickActionSheet xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/quick_action_sheet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="bottom"/>
\ No newline at end of file
+    android:layout_gravity="bottom"
+    android:background="@android:color/transparent" />
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index 419416f2b..de08f4c9a 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -15,7 +15,8 @@
         android:id="@+id/swipeRefresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/toolbar_and_qab_height">
+        android:layout_marginBottom="@dimen/browser_toolbar_height">
+
         <mozilla.components.concept.engine.EngineView
             android:id="@+id/engineView"
             android:layout_width="match_parent"
@@ -26,8 +27,7 @@
         android:id="@+id/nestedScrollQuickAction"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?foundation"
-        android:clipToPadding="true"
+        android:background="@android:color/transparent"
         app:behavior_hideable="true"
         app:behavior_peekHeight="12dp"
         app:layout_behavior="org.mozilla.fenix.quickactionsheet.QuickActionSheetBehavior" />
diff --git a/app/src/main/res/layout/layout_quick_action_sheet.xml b/app/src/main/res/layout/layout_quick_action_sheet.xml
index 4fd69692d..c673cc2ef 100644
--- a/app/src/main/res/layout/layout_quick_action_sheet.xml
+++ b/app/src/main/res/layout/layout_quick_action_sheet.xml
@@ -6,7 +6,8 @@
     android:id="@+id/quick_action_sheet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?foundation"
+    android:backgroundTint="?foundation"
+    android:background="@drawable/rounded_top_corners"
     android:orientation="vertical">
 
     <View
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7ddc13912..91821edc8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -54,6 +54,7 @@
     <style name="NormalTheme" parent="NormalThemeBase" />
 
     <style name="DialogStyle" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="dialogCornerRadius">@dimen/tab_corner_radius</item>
         <item name="android:colorBackground">?above</item>
         <item name="colorAccent">?accent</item>
         <item name="android:textColorPrimary">?primaryText</item>