From a31d205c32d1b6c5d8e91ded8b8dbf0512e5c8a5 Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Wed, 13 Mar 2013 15:26:25 -0700
Subject: [PATCH] Bug 823644: Remove the style named "Screen". [r=mfinkle]

--HG--
extra : rebase_source : 9bb92ef85913759a8f58cc7e9f3518317ebde796
---
 .../base/resources/layout/awesomebar.xml      |  5 +++-
 .../base/resources/layout/crash_reporter.xml  |  3 ++-
 .../base/resources/layout/gecko_app.xml       |  4 ++-
 .../base/resources/layout/launch_app_list.xml |  3 ++-
 .../base/resources/layout/setup_screen.xml    |  7 +++--
 .../android/base/resources/values/styles.xml  | 26 -------------------
 6 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/mobile/android/base/resources/layout/awesomebar.xml b/mobile/android/base/resources/layout/awesomebar.xml
index e027c1690c9..9cffa4c89fe 100644
--- a/mobile/android/base/resources/layout/awesomebar.xml
+++ b/mobile/android/base/resources/layout/awesomebar.xml
@@ -5,7 +5,10 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:id="@+id/awesome_screen"
-              style="@style/Screen.Transparent">
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
 
     <include layout="@layout/awesomebar_search"/>
 
diff --git a/mobile/android/base/resources/layout/crash_reporter.xml b/mobile/android/base/resources/layout/crash_reporter.xml
index 390665cc07e..d8468e19a48 100644
--- a/mobile/android/base/resources/layout/crash_reporter.xml
+++ b/mobile/android/base/resources/layout/crash_reporter.xml
@@ -4,7 +4,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            style="@style/Screen">
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
 
     <LinearLayout android:layout_width="fill_parent"
                   android:layout_height="fill_parent"
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index 717826a1467..814ce4659f8 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -15,7 +15,9 @@
 
    <view class="org.mozilla.gecko.GeckoApp$MainLayout"
          android:id="@+id/main_layout"
-         style="@style/Screen.Transparent">
+         android:layout_width="fill_parent"
+         android:layout_height="fill_parent"
+         android:background="@android:color/transparent">
 
         <!-- BrowserToolbar will be added dynamically -->
 
diff --git a/mobile/android/base/resources/layout/launch_app_list.xml b/mobile/android/base/resources/layout/launch_app_list.xml
index f8f4517560a..728b7979d5c 100644
--- a/mobile/android/base/resources/layout/launch_app_list.xml
+++ b/mobile/android/base/resources/layout/launch_app_list.xml
@@ -4,6 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/Screen"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
               android:padding="3dip"
               android:windowIsFloating="true"/>
diff --git a/mobile/android/base/resources/layout/setup_screen.xml b/mobile/android/base/resources/layout/setup_screen.xml
index 7e6bf396187..a6165c9f208 100644
--- a/mobile/android/base/resources/layout/setup_screen.xml
+++ b/mobile/android/base/resources/layout/setup_screen.xml
@@ -4,11 +4,10 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/Screen"
-              android:background="@color/background_normal"
-              android:orientation="vertical"
               android:layout_width="fill_parent"
-              android:layout_height="fill_parent" >
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:background="@color/background_normal">
 
     <LinearLayout android:orientation="vertical"
                   android:layout_width="fill_parent"
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 1bb97bb14ea..28eaab55278 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -5,12 +5,6 @@
 
 <resources>
 
-    <!-- Layout -->
-    <style name="Layout">
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">fill_parent</item>
-    </style>
-
     <style name="GeckoList" parent="android:style/Widget.ListView">
     </style>
 
@@ -24,26 +18,6 @@
         <item name="android:ellipsize">marquee</item>
     </style>
 
-    <!-- Horizontal Layout -->
-    <style name="Layout.Horizontal">
-        <item name="android:orientation">horizontal</item>
-    </style>
-
-    <!-- Vertical Layout -->
-    <style name="Layout.Vertical">
-        <item name="android:orientation">vertical</item>
-    </style>
-
-    <!-- Screen -->
-    <style name="Screen" parent="Layout.Vertical">
-        <item name="android:background">#fff</item>
-    </style>
-
-    <!-- Transparent Screen -->
-    <style name="Screen.Transparent">
-        <item name="android:background">#00000000</item>
-    </style>
-
     <!-- BrowserToolbar -->
     <style name="BrowserToolbar">
         <item name="android:layout_width">fill_parent</item>