From 2fba9df490e641cdecb9ed93526fbe6d273ea90e Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Fri, 23 Oct 2015 21:16:37 +0200
Subject: [PATCH] Bug 1217416 - Override Snackbar.Message style in base theme.
 r=margaret

--HG--
extra : commitid : CngQGyILL7N
extra : amend_source : 8382ef7a64fe45c568083ecbba1f85fba092580c
---
 mobile/android/base/GeckoApp.java               | 2 ++
 mobile/android/base/resources/values/styles.xml | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 7705b3031860..3ddbeaf390eb 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -72,6 +72,7 @@ import android.os.StrictMode;
 import android.provider.ContactsContract;
 import android.provider.MediaStore.Images.Media;
 import android.support.design.widget.Snackbar;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Base64;
@@ -851,6 +852,7 @@ public abstract class GeckoApp
             final SnackbarEventCallback snackbarCallback = new SnackbarEventCallback(callback);
 
             snackbar.setAction(action, snackbarCallback);
+            snackbar.setActionTextColor(ContextCompat.getColor(this, R.color.fennec_ui_orange));
             snackbar.setCallback(snackbarCallback);
         }
 
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 81c426cd2a50..bf2b8615980b 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.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/. -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
     <!--
         Base application styles. This could be overridden in other res/values-XXX/themes.xml.
@@ -293,6 +293,11 @@
         <item name="android:textSize">14sp</item>
     </style>
 
+    <style name="TextAppearance.Design.Snackbar.Message" parent="android:TextAppearance" tools:override="true">
+        <item name="android:textSize">@dimen/design_snackbar_text_size</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
     <!--
         TextAppearance
         Note: Gecko uses light theme as default, while Android uses dark.