Bug 823644: Remove the style named "Screen". [r=mfinkle]

--HG--
extra : rebase_source : 9bb92ef85913759a8f58cc7e9f3518317ebde796
This commit is contained in:
Sriram Ramasubramanian 2013-03-13 15:26:25 -07:00
parent 0cee1c49af
commit a31d205c32
6 changed files with 14 additions and 34 deletions

View File

@ -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"/>

View File

@ -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"

View File

@ -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 -->

View File

@ -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"/>

View File

@ -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"

View File

@ -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>