From 9624964bc38cea46e99686f537f73c273e28d3b5 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 5 Jun 2019 18:37:16 -0700
Subject: [PATCH]  For #3087 - Adds disabled color attr  (#3192)

* For #3087 - Adds disabled color attr

* Change alpha to 40%
---
 .../mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt    | 4 ++--
 .../java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt | 4 ++--
 app/src/main/res/color/state_list_text_color.xml              | 2 +-
 app/src/main/res/values-night/colors.xml                      | 1 +
 app/src/main/res/values/attrs.xml                             | 1 +
 app/src/main/res/values/colors.xml                            | 4 ++++
 app/src/main/res/values/styles.xml                            | 2 ++
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index 4cb7f99e3..06721d827 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -38,7 +38,7 @@ class DefaultToolbarMenu(
                 context.components.core.sessionManager.selectedSession?.canGoBack ?: true
             },
             secondaryImageTintResource = ThemeManager.resolveAttribute(
-                R.attr.neutral,
+                R.attr.disabled,
                 context
             ),
             disableInSecondaryState = true
@@ -57,7 +57,7 @@ class DefaultToolbarMenu(
                 context.components.core.sessionManager.selectedSession?.canGoForward ?: true
             },
             secondaryImageTintResource = ThemeManager.resolveAttribute(
-                R.attr.neutral,
+                R.attr.disabled,
                 context
             ),
             disableInSecondaryState = true
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
index da2260bd8..9115f39ac 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
@@ -39,7 +39,7 @@ class CustomTabToolbarMenu(
                 session?.canGoBack ?: true
             },
             secondaryImageTintResource = ThemeManager.resolveAttribute(
-                R.attr.neutral,
+                R.attr.disabled,
                 context
             ),
             disableInSecondaryState = true
@@ -58,7 +58,7 @@ class CustomTabToolbarMenu(
                 session?.canGoForward ?: true
             },
             secondaryImageTintResource = ThemeManager.resolveAttribute(
-                R.attr.neutral,
+                R.attr.disabled,
                 context
             ),
             disableInSecondaryState = true
diff --git a/app/src/main/res/color/state_list_text_color.xml b/app/src/main/res/color/state_list_text_color.xml
index 4b29becb1..68658629a 100644
--- a/app/src/main/res/color/state_list_text_color.xml
+++ b/app/src/main/res/color/state_list_text_color.xml
@@ -3,6 +3,6 @@
    - 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/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/disabled_text" />
+    <item android:state_enabled="false" android:color="?disabled" />
     <item android:color="?primaryText"/>
 </selector>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index b711506ec..423802a6f 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -17,6 +17,7 @@
     <color name="neutral_faded_normal_theme">@color/neutral_faded_dark_theme</color>
     <color name="shadow_normal_theme">@color/shadow_dark_theme</color>
     <color name="destructive_normal_theme">@color/destructive_dark_theme</color>
+    <color name="disabled_normal_theme">@color/disabled_dark_theme</color>
     <color name="scrimStart_normal_theme">@color/scrimStart_dark_theme</color>
     <color name="scrimEnd_normal_theme">@color/scrimEnd_dark_theme</color>
     <color name="toggle_off_knob_normal_theme">@color/toggle_off_knob_dark_theme</color>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 80155cbd7..43fb134fe 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -17,6 +17,7 @@
     <attr name="neutralFaded" format="reference" />
     <attr name="shadow" format="reference" />
     <attr name="destructive" format="reference"/>
+    <attr name="disabled" format="reference" />
 
     <attr name="scrimStart" format="reference"/>
     <attr name="scrimEnd" format="reference"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d1a2865e5..ac504facc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,6 +17,7 @@
     <color name="neutral_faded_light_theme">@color/photonGrey20</color>
     <color name="shadow_light_theme">#1F000000</color>
     <color name="destructive_light_theme">#C50042</color>
+    <color name="disabled_light_theme">#6620123A</color>
     <color name="scrimStart_light_theme">#F515141A</color>
     <color name="scrimEnd_light_theme">#F542414D</color>
 
@@ -34,6 +35,7 @@
     <color name="neutral_faded_dark_theme">#1FEDEDF0</color>
     <color name="shadow_dark_theme">#050505</color>
     <color name="destructive_dark_theme">#FF6A75</color>
+    <color name="disabled_dark_theme">#66FBFBFE</color>
     <color name="scrimStart_dark_theme">#F520123A</color>
     <color name="scrimEnd_dark_theme">#F515141A</color>
 
@@ -51,6 +53,7 @@
     <color name="neutral_faded_private_theme">#1FEDEDF0</color>
     <color name="shadow_private_theme">#2B1067</color>
     <color name="destructive_private_theme">#FF6A75</color>
+    <color name="disabled_private_theme">#66FBFBFE</color>
     <color name="scrimStart_private_theme">#F520123A</color>
     <color name="scrimEnd_private_theme">#F515141A</color>
 
@@ -68,6 +71,7 @@
     <color name="neutral_faded_normal_theme">@color/neutral_faded_light_theme</color>
     <color name="shadow_normal_theme">@color/shadow_light_theme</color>
     <color name="destructive_normal_theme">@color/destructive_light_theme</color>
+    <color name="disabled_normal_theme">@color/disabled_light_theme</color>
     <color name="scrimStart_normal_theme">@color/scrimStart_light_theme</color>
     <color name="scrimEnd_normal_theme">@color/scrimEnd_light_theme</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ee105bf08..fda43f792 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -39,6 +39,7 @@
         <item name="neutralFaded">@color/neutral_faded_normal_theme</item>
         <item name="shadow">@color/shadow_normal_theme</item>
         <item name="destructive">@color/destructive_normal_theme</item>
+        <item name="disabled">@color/disabled_normal_theme</item>
         <item name="scrimStart">@color/scrimStart_normal_theme</item>
         <item name="scrimEnd">@color/scrimEnd_normal_theme</item>
 
@@ -111,6 +112,7 @@
         <item name="neutralFaded">@color/neutral_faded_private_theme</item>
         <item name="shadow">@color/shadow_private_theme</item>
         <item name="destructive">@color/destructive_private_theme</item>
+        <item name="disabled">@color/disabled_private_theme</item>
         <item name="scrimStart">@color/scrimStart_private_theme</item>
         <item name="scrimEnd">@color/scrimEnd_private_theme</item>