From 7413f43a3b28876474d39e1e1c9444fecec1f573 Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Mon, 11 Mar 2013 14:07:10 -0700
Subject: [PATCH] Bug 847578: Flat Holo styled door hanger buttons. [r=mfinkle]

--HG--
extra : rebase_source : 10e4897f80d67f80846f672d97bb033b6f0637a3
---
 mobile/android/base/DoorHanger.java                 | 13 +++++++------
 mobile/android/base/Makefile.in                     |  1 +
 mobile/android/base/resources/layout/doorhanger.xml |  7 ++++++-
 .../base/resources/layout/doorhanger_button.xml     | 12 ++++++++++++
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 mobile/android/base/resources/layout/doorhanger_button.xml

diff --git a/mobile/android/base/DoorHanger.java b/mobile/android/base/DoorHanger.java
index 34bc7a45620..0bd8d2994e4 100644
--- a/mobile/android/base/DoorHanger.java
+++ b/mobile/android/base/DoorHanger.java
@@ -86,7 +86,8 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
 
         // Enable the button layout if we have buttons.
         if (buttons.length() > 0) {
-            mChoicesLayout.setVisibility(LinearLayout.VISIBLE);
+            findViewById(R.id.divider).setVisibility(View.VISIBLE);
+            mChoicesLayout.setVisibility(View.VISIBLE);
         }
 
         setOptions(options);
@@ -98,11 +99,11 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
                                              LayoutParams.FILL_PARENT,
                                              1.0f);
 
-        Button mButton = new Button(mActivity);
-        mButton.setText(aText);
-        mButton.setTag(Integer.toString(aCallback));
-        mButton.setOnClickListener(this);
-        mChoicesLayout.addView(mButton, mLayoutParams);
+        Button button = (Button) LayoutInflater.from(mActivity).inflate(R.layout.doorhanger_button, null);
+        button.setText(aText);
+        button.setTag(Integer.toString(aCallback));
+        button.setOnClickListener(this);
+        mChoicesLayout.addView(button, mLayoutParams);
     }
 
     @Override
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index f6785a10a6c..f2c51b3aa96 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -413,6 +413,7 @@ RES_LAYOUT = \
   res/layout/datetime_picker.xml \
   res/layout/doorhangerpopup.xml \
   res/layout/doorhanger.xml \
+  res/layout/doorhanger_button.xml \
   res/layout/find_in_page_content.xml \
   res/layout/font_size_preference.xml \
   res/layout/gecko_appwidget.xml \
diff --git a/mobile/android/base/resources/layout/doorhanger.xml b/mobile/android/base/resources/layout/doorhanger.xml
index ea1b136b8a2..8de107364d7 100644
--- a/mobile/android/base/resources/layout/doorhanger.xml
+++ b/mobile/android/base/resources/layout/doorhanger.xml
@@ -21,8 +21,13 @@
               android:textColor="@color/doorhanger_text"
               android:visibility="gone"/>
 
+    <View android:id="@+id/divider"
+          android:layout_width="fill_parent"
+          android:layout_height="1dp"
+          android:background="#FFD1D5DA"
+          android:visibility="gone"/>
+
     <LinearLayout android:id="@+id/doorhanger_choices"
-                  style="@android:style/ButtonBar"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:orientation="horizontal"
diff --git a/mobile/android/base/resources/layout/doorhanger_button.xml b/mobile/android/base/resources/layout/doorhanger_button.xml
new file mode 100644
index 00000000000..54bcb501ef4
--- /dev/null
+++ b/mobile/android/base/resources/layout/doorhanger_button.xml
@@ -0,0 +1,12 @@
+<?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/. -->
+
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="48dip"
+        android:textColor="#FF222222"
+        android:textSize="14sp"
+        android:background="@drawable/action_bar_button"/>