From d183fc0d8351093923178ea318e567c98dbb74f5 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Thu, 17 Nov 2011 10:52:23 +0000
Subject: [PATCH] Bug 697189 - Don't use transparent theme on AwesomeBar screen
 (r=mfinkle)

Otherwise the current web page will be visible 'under' the AwesomeBar screen
while SKB slides in and out.
---
 embedding/android/AndroidManifest.xml.in                  | 2 +-
 .../android/resources/layout/awesomebar_header_row.xml    | 1 +
 embedding/android/resources/layout/awesomebar_row.xml     | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/embedding/android/AndroidManifest.xml.in b/embedding/android/AndroidManifest.xml.in
index 7b5c4e9abf6a..ec4fa2f213d6 100644
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -130,7 +130,7 @@
         </activity>
 
         <activity android:name="org.mozilla.gecko.AwesomeBar"
-                  android:theme="@android:style/Theme.Translucent"
+                  android:theme="@android:style/Theme.Light"
                   android:configChanges="orientation"
                   android:windowSoftInputMode="stateAlwaysVisible|adjustResize"
                   android:windowIsTranslucent="true"
diff --git a/embedding/android/resources/layout/awesomebar_header_row.xml b/embedding/android/resources/layout/awesomebar_header_row.xml
index edf13e94ae3e..76e14e1ac128 100644
--- a/embedding/android/resources/layout/awesomebar_header_row.xml
+++ b/embedding/android/resources/layout/awesomebar_header_row.xml
@@ -1,5 +1,6 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           style="?android:attr/listSeparatorTextViewStyle"
+          android:textColor="?android:attr/textColorPrimary"
           android:id="@+id/title"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
diff --git a/embedding/android/resources/layout/awesomebar_row.xml b/embedding/android/resources/layout/awesomebar_row.xml
index 119f4073a73a..2e7a4b502979 100644
--- a/embedding/android/resources/layout/awesomebar_row.xml
+++ b/embedding/android/resources/layout/awesomebar_row.xml
@@ -17,8 +17,8 @@
     <TextView android:id="@+id/title"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:textAppearance="?android:attr/textAppearanceMediumInverse"
-              android:textColor="?android:attr/textColorPrimaryInverse"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:textColor="?android:attr/textColorPrimary"
               android:layout_toRightOf="@id/favicon"
               android:singleLine="true"
               android:ellipsize="middle"/>
@@ -26,8 +26,8 @@
     <TextView android:id="@+id/url"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:textAppearance="?android:attr/textAppearanceSmallInverse"
-              android:textColor="?android:attr/textColorSecondaryInverse"
+              android:textAppearance="?android:attr/textAppearanceSmall"
+              android:textColor="?android:attr/textColorSecondary"
               android:layout_marginTop="2dip"
               android:layout_below="@id/title"
               android:layout_alignLeft="@id/title"