From 3954c55c539e912970d864e963671699334c1dae Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Tue, 19 Feb 2019 16:08:01 -0800
Subject: [PATCH] Closes #586 - Use Circular Ripple for Tab List Header Icons

---
 ...ivate_browsing_button_white_background.xml | 19 -------------------
 app/src/main/res/layout/tab_list_header.xml   |  4 ++--
 app/src/main/res/values-v23/styles.xml        | 11 -----------
 app/src/main/res/values-v27/styles.xml        | 12 ------------
 app/src/main/res/values/styles.xml            | 13 +------------
 5 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 app/src/main/res/drawable/private_browsing_button_white_background.xml

diff --git a/app/src/main/res/drawable/private_browsing_button_white_background.xml b/app/src/main/res/drawable/private_browsing_button_white_background.xml
deleted file mode 100644
index 72b71d81d..000000000
--- a/app/src/main/res/drawable/private_browsing_button_white_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?android:attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape>
-            <solid android:color="#000000" />
-            <corners android:radius="32dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@color/off_white" />
-            <corners android:radius="32dp" />
-        </shape>
-    </item>
-</ripple>
diff --git a/app/src/main/res/layout/tab_list_header.xml b/app/src/main/res/layout/tab_list_header.xml
index 37007580e..e277e3821 100644
--- a/app/src/main/res/layout/tab_list_header.xml
+++ b/app/src/main/res/layout/tab_list_header.xml
@@ -26,7 +26,7 @@
         android:id="@+id/add_tab_button"
         android:layout_width="@dimen/glyph_button_width"
         android:layout_height="@dimen/glyph_button_height"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:src="@drawable/ic_new"
         android:tint="?attr/toolbarTextColor"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -37,7 +37,7 @@
         android:id="@+id/tabs_overflow_button"
         android:layout_width="@dimen/glyph_button_width"
         android:layout_height="@dimen/glyph_button_height"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:src="@drawable/ic_menu"
         android:tint="?attr/toolbarTextColor"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index fbbd39522..63003b0a3 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -24,15 +24,4 @@
         <!-- Style the navigation bar -->
         <item name="android:navigationBarColor">@color/private_browsing_bottom_gradient</item>
     </style>
-
-    <style name="SettingsTheme" parent="SettingsThemeBase">
-        <!-- Style the status bar -->
-        <!-- We have to pull in the changes from v23/styles.xml to make
-            sure we also get them in 27+ -->
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-
-        <!-- Style the navigation bar -->
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 9355b8b7f..36d278dbb 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -26,16 +26,4 @@
         <item name="android:navigationBarDividerColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
-
-    <style name="SettingsTheme" parent="SettingsThemeBase">
-        <!-- Style the status bar -->
-        <!-- We have to pull in the changes from v23/styles.xml to make
-            sure we also get them in 27+ -->
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-
-        <!-- Style the navigation bar -->
-        <item name="android:navigationBarDividerColor">@android:color/transparent</item>
-        <item name="android:windowLightNavigationBar">true</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6683c69da..cd47664dc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,7 +17,7 @@
         <item name="homeBackgroundTopGradient">@color/off_white</item>
         <item name="homeBackgroundBottomGradient">@color/off_white</item>
         <item name="homeBackgroundGradient">@drawable/home_background_gradient</item>
-        <item name="privateBrowsingButtonBackground">@drawable/private_browsing_button_white_background</item>
+        <item name="privateBrowsingButtonBackground">?android:attr/selectableItemBackgroundBorderless</item>
         <item name="privateBrowsingButtonTint">@color/off_white</item>
         <item name="fenixLogo">@drawable/ic_logo_wordmark</item>
         <item name="menuButtonTint">@android:color/black</item>
@@ -91,17 +91,6 @@
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
     </style>
 
-    <style name="SettingsThemeBase" parent="Theme.MaterialComponents.Light">
-        <item name="colorPrimary">@color/off_white</item>
-        <item name="colorPrimaryDark">@color/off_white</item>
-        <item name="colorAccent">@color/icons</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-
-    <style name="SettingsTheme" parent="SettingsThemeBase">
-
-    </style>
-
     <style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>