From 1447b91a32a2ca5b17a382aab89f55a40700bcbb Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Mon, 24 Sep 2012 14:52:25 -0700
Subject: [PATCH] Bug 793162 - Use default Fennec theme for Webapps. r=mfinkle

---
 mobile/android/base/WebAppManifestFragment.xml.frag | 2 +-
 mobile/android/base/resources/values-v11/themes.xml | 5 -----
 mobile/android/base/resources/values/themes.xml     | 4 +---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/mobile/android/base/WebAppManifestFragment.xml.frag b/mobile/android/base/WebAppManifestFragment.xml.frag
index 96d83506034..09bc1b838b1 100644
--- a/mobile/android/base/WebAppManifestFragment.xml.frag
+++ b/mobile/android/base/WebAppManifestFragment.xml.frag
@@ -5,7 +5,7 @@
                   android:launchMode="singleInstance"
                   android:taskAffinity="org.mozilla.gecko.WEBAPP@APPNUM@"
                   android:process=":@ANDROID_PACKAGE_NAME@.WebApp@APPNUM@"
-                  android:theme="@style/Gecko.Translucent.NoActionBar">
+                  android:theme="@style/Gecko.App">
             <intent-filter>
                 <action android:name="org.mozilla.gecko.WEBAPP@APPNUM@" />
             </intent-filter>
diff --git a/mobile/android/base/resources/values-v11/themes.xml b/mobile/android/base/resources/values-v11/themes.xml
index 9ac60c34f01..65f89905d57 100644
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -43,11 +43,6 @@
         <item name="android:windowNoTitle">false</item>
     </style>
 
-    <style name="Gecko.Translucent.NoActionBar">
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
     <style name="Gecko.App">
         <item name="android:windowBackground">@drawable/abouthome_bg_repeat</item>
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index 2336f31e475..0ff60b24f2c 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -36,12 +36,10 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
-    <style name="Gecko.Translucent.NoActionBar"  parent="Gecko.Translucent"/>
-
     <style name="Gecko.App">
         <item name="android:windowBackground">@drawable/abouthome_bg_repeat</item>
     </style>
-    
+
     <style name="Gecko.Light.AwesomeBar"/>
     
     <style name="Gecko.TitleBar.Preferences"/>