From 1fcf632550d20f5740bc0aa70ce945afe517ea26 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Tue, 2 Sep 2014 16:07:44 +0100
Subject: [PATCH] Bug 1055536 - Consolidate divider colors (r=margaret)

---
 .../android/base/resources/drawable/divider_horizontal.xml | 2 +-
 .../android/base/resources/drawable/divider_vertical.xml   | 2 +-
 .../resources/drawable/home_panel_title_background.xml     | 2 +-
 mobile/android/base/resources/values-v11/styles.xml        | 2 +-
 mobile/android/base/resources/values/colors.xml            | 7 ++++---
 mobile/android/base/resources/values/styles.xml            | 4 ++--
 mobile/android/base/widget/DoorHanger.java                 | 4 ++--
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mobile/android/base/resources/drawable/divider_horizontal.xml b/mobile/android/base/resources/drawable/divider_horizontal.xml
index 4326c2c4fa3..31e4a9dd81b 100644
--- a/mobile/android/base/resources/drawable/divider_horizontal.xml
+++ b/mobile/android/base/resources/drawable/divider_horizontal.xml
@@ -6,7 +6,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
 
-    <solid android:color="#D7D9DB"/>
+    <solid android:color="@color/divider_light"/>
     <size android:height="1dp" />
 
 </shape>
diff --git a/mobile/android/base/resources/drawable/divider_vertical.xml b/mobile/android/base/resources/drawable/divider_vertical.xml
index 1810d6dce1c..8f289b050ad 100644
--- a/mobile/android/base/resources/drawable/divider_vertical.xml
+++ b/mobile/android/base/resources/drawable/divider_vertical.xml
@@ -6,7 +6,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
 
-    <solid android:color="#D7D9DB"/>
+    <solid android:color="@color/divider_light"/>
     <size android:width="1dp" />
 
 </shape>
diff --git a/mobile/android/base/resources/drawable/home_panel_title_background.xml b/mobile/android/base/resources/drawable/home_panel_title_background.xml
index 195826ca318..4f5cc8d1d2f 100644
--- a/mobile/android/base/resources/drawable/home_panel_title_background.xml
+++ b/mobile/android/base/resources/drawable/home_panel_title_background.xml
@@ -6,7 +6,7 @@
 
         <shape android:shape="rectangle" >
             <stroke android:width="1px"
-                    android:color="@color/doorhanger_divider_light" />
+                    android:color="@color/divider_light" />
 
             <solid android:color="#00000000" />
         </shape>
diff --git a/mobile/android/base/resources/values-v11/styles.xml b/mobile/android/base/resources/values-v11/styles.xml
index 3956ba8683d..a15b1e03e38 100644
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -59,7 +59,7 @@
     <!-- DropDown List View -->
     <style name="DropDownListView" parent="@android:style/Widget.Holo.ListView.DropDown">
          <item name="android:listSelector">@drawable/action_bar_button</item>
-         <item name="android:divider">#FFD7D9DB</item>
+         <item name="android:divider">@color/divider_light</item>
          <item name="android:dividerHeight">1dp</item>
     </style>
 
diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml
index ea62a73be2b..b42dc6ad7ee 100644
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -69,6 +69,10 @@
   <!-- Link colors -->
   <color name="text_color_link">#22629E</color>
 
+  <!-- Divider colors -->
+  <color name="divider_light">#FFD7D9DB</color>
+  <color name="divider_dark">#FFB3C2CE</color>
+
   <color name="splash_background">#000000</color>
   <color name="splash_msgfont">#ffffff</color>
   <color name="splash_urlfont">#000000</color>
@@ -76,8 +80,6 @@
 
   <color name="doorhanger_text">#FF222222</color>
   <color name="doorhanger_link">#FF2AA1FE</color>
-  <color name="doorhanger_divider_light">#FFD7D9DB</color>
-  <color name="doorhanger_divider_dark">#FFB3C2CE</color>
   <color name="doorhanger_background_dark">#FFDDE4EA</color>
 
   <color name="validation_message_text">#ffffff</color>
@@ -120,6 +122,5 @@
   <color name="toast_background">#DD363B40</color>
   <color name="toast_button_background">#00000000</color>
   <color name="toast_button_pressed">#DD2C3136</color>
-  <color name="toast_button_divider">#FFD7D9DB</color>
   <color name="toast_button_text">#FFFFFFFF</color>
 </resources>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index e4bd9782d5d..1b13a198e8d 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -45,7 +45,7 @@
     </style>
 
     <style name="Widget.ListView" parent="Widget.BaseListView">
-        <item name="android:divider">#D7D9DB</item>
+        <item name="android:divider">@color/divider_light</item>
         <item name="android:dividerHeight">1dp</item>
         <item name="android:cacheColorHint">@android:color/transparent</item>
         <item name="android:listSelector">@drawable/action_bar_button</item>
@@ -686,7 +686,7 @@
     </style>
 
     <style name="ToastDividerBase">
-        <item name="android:background">@color/toast_button_divider</item>
+        <item name="android:background">@color/divider_light</item>
         <item name="android:layout_width">1dp</item>
         <item name="android:layout_height">match_parent</item>
     </style>
diff --git a/mobile/android/base/widget/DoorHanger.java b/mobile/android/base/widget/DoorHanger.java
index 627ed5a9dcf..044d969ffc4 100644
--- a/mobile/android/base/widget/DoorHanger.java
+++ b/mobile/android/base/widget/DoorHanger.java
@@ -121,10 +121,10 @@ public class DoorHanger extends LinearLayout {
         if (theme == Theme.LIGHT) {
             // The default styles declared in doorhanger.xml are light-themed, so we just
             // need to set the divider color that we'll use in addButton.
-            mDividerColor = mResources.getColor(R.color.doorhanger_divider_light);
+            mDividerColor = mResources.getColor(R.color.divider_light);
 
         } else if (theme == Theme.DARK) {
-            mDividerColor = mResources.getColor(R.color.doorhanger_divider_dark);
+            mDividerColor = mResources.getColor(R.color.divider_dark);
 
             // Set a dark background, and use a smaller text size for dark-themed DoorHangers.
             setBackgroundColor(mResources.getColor(R.color.doorhanger_background_dark));