From a01881067f8be6f125743570aee9fe8892d7a71a Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Thu, 7 May 2020 12:09:36 -0700
Subject: [PATCH] For #8643: Updates colors of onboarding accents

---
 app/src/main/res/layout/onboarding_finish.xml |  2 +-
 app/src/main/res/values/attrs.xml             |  3 ---
 app/src/main/res/values/styles.xml            | 13 +------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/layout/onboarding_finish.xml b/app/src/main/res/layout/onboarding_finish.xml
index 60b123e9b..16601fa54 100644
--- a/app/src/main/res/layout/onboarding_finish.xml
+++ b/app/src/main/res/layout/onboarding_finish.xml
@@ -3,7 +3,7 @@
    - 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/. -->
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/FinishOnboardingButton"
+    style="@style/PositiveButton"
     android:layout_height="36dp"
     android:id="@+id/finish_button"
     android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c72db81ae..1e70ca8df 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -45,9 +45,6 @@
     <attr name="swipeDeleteBackground" format="reference" />
     <attr name="onboardingDarkGradientStartBackground" format="reference" />
     <attr name="onboardingDarkGradientEndBackground" format="reference" />
-    <attr name="onboardingActionButtonBackground" format="reference" />
-    <attr name="onboardingFinishButtonBackground" format="reference" />
-    <attr name="onboardingFinishButtonText" format="reference" />
     <attr name="onboardingSelected" format="reference"/>
     <attr name="onboardingDeselected" format="reference"/>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ff9862f07..af988a39d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -68,9 +68,6 @@
         <item name="swipeDeleteBackground">@color/swipe_delete_background_normal_theme</item>
         <item name="onboardingDarkGradientStartBackground">@color/onboarding_card_background_start_gradient_normal_theme</item>
         <item name="onboardingDarkGradientEndBackground">@color/onboarding_card_background_end_gradient_normal_theme</item>
-        <item name="onboardingActionButtonBackground">@color/onboarding_card_button_normal_theme</item>
-        <item name="onboardingFinishButtonBackground">@color/onboarding_card_finish_button_normal_theme</item>
-        <item name="onboardingFinishButtonText">@color/onboarding_finish_button_text_normal_theme</item>
         <item name="onboardingSelected">@color/onboarding_illustration_selected_normal_theme</item>
         <item name="onboardingDeselected">@color/onboarding_illustration_deselected_normal_theme</item>
 
@@ -191,9 +188,6 @@
         <item name="swipeDeleteBackground">@color/swipe_delete_background_private_theme</item>
         <item name="onboardingDarkGradientStartBackground">@color/onboarding_card_background_start_gradient_private_theme</item>
         <item name="onboardingDarkGradientEndBackground">@color/onboarding_card_background_end_gradient_private_theme</item>
-        <item name="onboardingActionButtonBackground">@color/onboarding_card_button_private_theme</item>
-        <item name="onboardingFinishButtonBackground">@color/onboarding_card_finish_button_private_theme</item>
-        <item name="onboardingFinishButtonText">@color/onboarding_finish_button_text_private_theme</item>
         <item name="onboardingSelected">@color/onboarding_illustration_selected_private_theme</item>
         <item name="onboardingDeselected">@color/onboarding_illustration_deselected_private_theme</item>
 
@@ -247,7 +241,7 @@
 
     <!-- Ideally we should consolidate this with NeutralButton in the future -->
     <style name="NeutralOnboardingButton" parent="NeutralButton">
-        <item name="backgroundTint">?onboardingActionButtonBackground</item>
+        <item name="backgroundTint">?neutralFaded</item>
         <item name="android:layout_height">36dp</item>
         <item name="android:textColor">?primaryText</item>
     </style>
@@ -263,11 +257,6 @@
         <item name="android:textColor">?contrastText</item>
     </style>
 
-    <style name="FinishOnboardingButton" parent="NeutralButton">
-        <item name="backgroundTint">?onboardingFinishButtonBackground</item>
-        <item name="android:textColor">?onboardingFinishButtonText</item>
-    </style>
-
     <style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">32dp</item>