wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out a23ff3177682 (bug 823644), 02d63d7e6c87 (bug 848961), 505fbab9b980:2f24c9525f57 (bug 823644) for mochitest-1 and robocop-2 bustage

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-03-18 20:00:04 -07:00
parent 840720b543
commit 7d8a10d60b
41 changed files with 308 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/AndroidManifest.xml.in
View File

@ -216,13 +216,24 @@
</activity>
#endif
<!-- Bug 715260: Hiding Webapps support
<activity android:name="LauncherShortcuts"
android:label="@string/launcher_shortcuts_title"
android:theme="@style/Gecko.Translucent">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
-->
<activity android:name="org.mozilla.gecko.AwesomeBar"
android:theme="@style/Gecko.AwesomeBar"
android:theme="@style/Gecko.Light.AwesomeBar"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateAlwaysVisible|adjustResize"/>
<activity android:name="org.mozilla.gecko.GeckoPreferences"
android:theme="@style/Gecko.Preferences"
android:theme="@style/Gecko.TitleBar.Preferences"
android:label="@string/settings_title"
android:configChanges="orientation|screenSize"
android:excludeFromRecents="true"/>

5
mobile/android/base/Makefile.in
View File

@ -375,9 +375,11 @@ RES_LAYOUT = \
res/layout/autocomplete_list_item.xml \
res/layout/awesomebar.xml \
res/layout/awesomebar_actionbar.xml \
res/layout/awesomebar_expandable_list.xml \
res/layout/awesomebar_folder_row.xml \
res/layout/awesomebar_header_row.xml \
res/layout/awesomebar_allpages_list.xml \
res/layout/awesomebar_list.xml \
res/layout/awesomebar_row.xml \
res/layout/awesomebar_search.xml \
res/layout/awesomebar_suggestion_row.xml \
@ -438,6 +440,8 @@ RES_LAYOUT_LAND_V14 = \
RES_LAYOUT_LARGE_V11 = \
res/layout-large-v11/awesomebar_search.xml \
res/layout-large-v11/browser_toolbar_menu.xml \
res/layout-large-v11/doorhangerpopup.xml \
res/layout-large-v11/site_identity_popup.xml \
$(NULL)
RES_LAYOUT_LARGE_LAND_V11 = \
@ -488,7 +492,6 @@ RES_VALUES_LARGE_V11 = \
res/values-large-v11/dimens.xml \
res/values-large-v11/layout.xml \
res/values-large-v11/styles.xml \
res/values-large-v11/themes.xml \
$(NULL)
RES_VALUES_LARGE_LAND_V11 = \

2
mobile/android/base/SiteIdentityPopup.java
View File

@ -154,7 +154,7 @@ public class SiteIdentityPopup extends PopupWindow {
int offset = 0;
if (GeckoApp.mAppContext.isTablet()) {
int popupWidth = mResources.getDimensionPixelSize(R.dimen.doorhanger_width);
int popupWidth = mResources.getDimensionPixelSize(R.dimen.popup_width);
offset = 0 - popupWidth + arrowWidth*3/2 + v.getWidth()/2;
}

2
mobile/android/base/awesomebar/BookmarksTab.java
View File

@ -58,7 +58,7 @@ public class BookmarksTab extends AwesomeBarTab {
@Override
public View getView() {
if (mView == null) {
mView = new ListView(mContext, null);
mView = (LayoutInflater.from(mContext).inflate(R.layout.awesomebar_list, null));
((Activity)mContext).registerForContextMenu(mView);
mView.setTag(TAG);
mView.setOnTouchListener(mListListener);

2
mobile/android/base/awesomebar/HistoryTab.java
View File

@ -68,7 +68,7 @@ public class HistoryTab extends AwesomeBarTab {
@Override
public ListView getView() {
if (mView == null) {
mView = new ExpandableListView(mContext, null);
mView = LayoutInflater.from(mContext).inflate(R.layout.awesomebar_expandable_list, null);
((Activity)mContext).registerForContextMenu(mView);
mView.setTag(TAG);

2
mobile/android/base/resources/color/abouthome_section_subtitle.xml
View File

@ -13,6 +13,6 @@
<item gecko:state_light="true" android:color="#CC222222" />
<!-- default -->
<item android:color="@color/text_color_secondary"/>
<item android:color="#FF666666"/>
</selector>

6
mobile/android/base/resources/color/abouthome_section_title.xml
View File

@ -7,12 +7,12 @@
xmlns:gecko="http://schemas.android.com/apk/res-auto">
<!-- dark theme -->
<item gecko:state_dark="true" android:color="@color/text_color_primary_inverse" />
<item gecko:state_dark="true" android:color="#FFFFFFFF" />
<!-- light theme -->
<item gecko:state_light="true" android:color="@color/text_color_primary" />
<item gecko:state_light="true" android:color="#FF222222" />
<!-- default -->
<item android:color="@color/text_color_primary"/>
<item android:color="#FF000000"/>
</selector>

30
mobile/android/base/resources/layout-large-v11/doorhangerpopup.xml Normal file
View File

@ -0,0 +1,30 @@
<?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/. -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<ScrollView android:layout_width="@dimen/popup_width"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@drawable/doorhanger_popup_bg">
<LinearLayout android:id="@+id/doorhanger_container"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"/>
</ScrollView>
<ImageView android:id="@+id/doorhanger_arrow"
android:layout_width="@dimen/menu_popup_arrow_width"
android:layout_height="12dip"
android:layout_marginLeft="4dip"
android:layout_alignParentTop="true"
android:src="@drawable/menu_popup_arrow_top"
android:scaleType="fitXY"/>
</RelativeLayout>

68
mobile/android/base/resources/layout-large-v11/site_identity_popup.xml Normal file
View File

@ -0,0 +1,68 @@
<?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/. -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/popup_width"
android:layout_height="wrap_content">
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentTop="true"
android:background="@drawable/doorhanger_popup_bg">
<LinearLayout android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:orientation="vertical"
android:padding="12dip">
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textColor="@color/doorhanger_text"
android:text="@string/identity_connected_to"/>
<TextView android:id="@+id/host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textColor="@color/doorhanger_text"
android:text="@string/identity_run_by"
android:paddingTop="12dip"/>
<TextView android:id="@+id/owner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"/>
<TextView android:id="@+id/verifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textColor="@color/doorhanger_text"
android:paddingTop="12dip"/>
</LinearLayout>
<ImageView android:id="@+id/larry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="15dip"/>
</LinearLayout>
<ImageView android:id="@+id/arrow"
android:layout_width="@dimen/menu_popup_arrow_width"
android:layout_height="12dip"
android:layout_alignParentTop="true"
android:src="@drawable/menu_popup_arrow_top"
android:scaleType="fitXY"/>
</RelativeLayout>

2
mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
View File

@ -51,7 +51,7 @@
android:drawablePadding="7dp"
android:gravity="center"
android:clickable="true"
android:textSize="16sp"
android:textSize="15sp"
android:textColor="#FFFFFF"
android:visibility="gone"/>

2
mobile/android/base/resources/layout/abouthome_content.xml
View File

@ -61,7 +61,7 @@
android:drawablePadding="7dp"
android:gravity="center"
android:clickable="true"
android:textSize="16sp"
android:textSize="15sp"
android:textColor="#FFFFFF"
android:visibility="gone"/>

2
mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
View File

@ -24,7 +24,7 @@
android:layout_marginTop="2dip"
android:layout_marginLeft="12dip"
android:layout_marginRight="12dip"
android:textSize="16sp"
android:textSize="15sp"
android:singleLine="true"
android:textColor="@color/abouthome_section_title"
android:duplicateParentState="true"/>

5
mobile/android/base/resources/layout/awesomebar.xml
View File

@ -5,10 +5,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/awesome_screen"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:background="@android:color/transparent">
style="@style/Screen.Transparent">
<include layout="@layout/awesomebar_search"/>

5
mobile/android/base/resources/layout/awesomebar_allpages_list.xml
View File

@ -8,8 +8,7 @@
android:layout_height="fill_parent"
android:orientation="vertical">
<ListView android:id="@+id/awesomebar_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<include layout="@layout/awesomebar_list"
android:id="@+id/awesomebar_list"/>
</LinearLayout>

8
mobile/android/base/resources/layout/awesomebar_expandable_list.xml Normal file
View File

@ -0,0 +1,8 @@
<?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/. -->
<ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/AwesomeBarList"
android:groupIndicator="@android:color/transparent"/>

2
mobile/android/base/resources/layout/awesomebar_header_row.xml
View File

@ -9,7 +9,7 @@
android:layout_height="@dimen/awesomebar_header_row_height"
android:background="#D2DAE2"
android:textColor="#222222"
android:textSize="14sp"
android:textSize="13sp"
android:textStyle="bold"
android:gravity="center_vertical"
android:paddingLeft="6dip"

7
mobile/android/base/resources/layout/awesomebar_list.xml Normal file
View File

@ -0,0 +1,7 @@
<?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/. -->
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/AwesomeBarList"/>

2
mobile/android/base/resources/layout/awesomebar_row.xml
View File

@ -46,7 +46,7 @@
android:layout_marginLeft="6dip"
android:layout_marginRight="6dip"
android:textColor="#9198A1"
android:textSize="14sp"
android:textSize="13sp"
android:layout_below="@id/title"
android:layout_toRightOf="@id/favicon"
android:layout_toLeftOf="@id/bookmark_icon"

2
mobile/android/base/resources/layout/awesomebar_suggestion_item.xml
View File

@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#222222"
android:textSize="14sp"
android:textSize="13sp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"/>

6
mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
View File

@ -18,13 +18,13 @@
android:layout_width="wrap_content"
android:textColor="@color/awesome_bar_title"
android:layout_marginLeft="6dip"
android:textSize="14sp"
android:textSize="13sp"
android:layout_weight="1" />
<TextView android:id="@+id/suggestions_prompt_yes"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="14sp"
android:textSize="13sp"
android:layout_marginLeft="15dip"
android:background="@drawable/suggestion_selector"
android:paddingLeft="15dp"
@ -37,7 +37,7 @@
<TextView android:id="@+id/suggestions_prompt_no"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="14sp"
android:textSize="13sp"
android:layout_marginLeft="6dip"
android:background="@drawable/suggestion_selector"
android:paddingLeft="15dp"

2
mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
View File

@ -13,6 +13,6 @@
android:padding="10dp"
android:singleLine="true"
android:ellipsize="marquee"
android:textSize="14sp"
android:textSize="13sp"
android:textColor="@color/awesome_bar_title"
gecko:autoUpdateTheme="false"/>

5
mobile/android/base/resources/layout/awesomebar_tabs.xml
View File

@ -37,10 +37,7 @@
<android.support.v4.view.ViewPager
android:id="@+id/tabviewpager"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#EEF1F5"
android:paddingLeft="@dimen/awesomebar_list_padding"
android:paddingRight="@dimen/awesomebar_list_padding"/>
android:layout_height="fill_parent"/>
</LinearLayout>

3
mobile/android/base/resources/layout/crash_reporter.xml
View File

@ -4,8 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
style="@style/Screen">
<LinearLayout android:layout_width="fill_parent"
android:layout_height="fill_parent"

2
mobile/android/base/resources/layout/doorhangerpopup.xml
View File

@ -7,7 +7,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<ScrollView android:layout_width="?attr/doorhangerWidth"
<ScrollView android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@drawable/doorhanger_popup_bg">

4
mobile/android/base/resources/layout/gecko_app.xml
View File

@ -15,9 +15,7 @@
<view class="org.mozilla.gecko.GeckoApp$MainLayout"
android:id="@+id/main_layout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:color/transparent">
style="@style/Screen.Transparent">
<!-- BrowserToolbar will be added dynamically -->

3
mobile/android/base/resources/layout/launch_app_list.xml
View File

@ -4,7 +4,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
style="@style/Screen"
android:padding="3dip"
android:windowIsFloating="true"/>

15
mobile/android/base/resources/layout/select_dialog_list.xml
View File

@ -4,10 +4,11 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- This is used for select lists for multiple selection enabled -->
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/select_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:cacheColorHint="@null"
android:scrollbars="vertical"
android:overScrollMode="ifContentScrolls" />
<view xmlns:android="http://schemas.android.com/apk/res/android"
class="android.widget.ListView"
android:id="@+id/select_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:cacheColorHint="@null"
android:scrollbars="vertical"
android:overScrollMode="ifContentScrolls" />

2
mobile/android/base/resources/layout/select_dialog_multichoice.xml
View File

@ -18,4 +18,4 @@
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.ListItem"/>
style="@style/GeckoList.ListItem"/>

7
mobile/android/base/resources/layout/setup_screen.xml
View File

@ -4,10 +4,11 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
style="@style/Screen"
android:background="@color/background_normal"
android:orientation="vertical"
android:background="@color/background_normal">
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
<LinearLayout android:orientation="vertical"
android:layout_width="fill_parent"

8
mobile/android/base/resources/layout/site_identity_popup.xml
View File

@ -4,7 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="?attr/doorhangerWidth"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout android:layout_width="fill_parent"
@ -21,7 +21,7 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textSize="12sp"
android:textColor="@color/doorhanger_text"
android:text="@string/identity_connected_to"/>
@ -32,7 +32,7 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textSize="12sp"
android:textColor="@color/doorhanger_text"
android:text="@string/identity_run_by"
android:paddingTop="12dip"/>
@ -45,7 +45,7 @@
<TextView android:id="@+id/verifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textSize="12sp"
android:textColor="@color/doorhanger_text"
android:paddingTop="12dip"/>

4
mobile/android/base/resources/layout/site_setting_item.xml
View File

@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
style="Widget.ListItem"
style="GeckoList.ListItem"
android:gravity="center_vertical|left"
android:singleLine="true"
android:ellipsize="marquee"/>
@ -34,7 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
style="Widget.ListItem"
style="GeckoList.ListItem"
android:gravity="center_vertical|left"
android:singleLine="true"
android:ellipsize="marquee"/>

19
mobile/android/base/resources/values-large-v11/themes.xml
View File

@ -1,19 +0,0 @@
<?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/. -->
<resources>
<!--
Base application theme. This could be overridden by GeckoBaseTheme
in other res/values-XXX/themes.xml.
-->
<style name="GeckoBase" parent="@android:style/Theme.Holo.Light">
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="doorhangerWidth">@dimen/doorhanger_width</item>
</style>
</resources>

24
mobile/android/base/resources/values-v11/styles.xml
View File

@ -10,16 +10,19 @@
Please refer to values/styles.xml for default styles.
-->
<!--
Base application styles. This could be overridden in other res/values-XXX/themes.xml.
-->
<style name="Widget.BaseListView" parent="android:style/Widget.Holo.ListView"/>
<!-- Lists in AwesomeBar -->
<style name="GeckoList" parent="android:style/Widget.Holo.ListView">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:background">#EEF1F5</item>
<item name="android:divider">#D1D5DA</item>
<item name="android:dividerHeight">1dp</item>
<item name="android:cacheColorHint">#EEF1F5</item>
<item name="android:listSelector">@drawable/action_bar_button</item>
</style>
<!--
Application styles. All customizations that are not specific
to a particular API level can go here.
-->
<style name="Widget.ListItem">
<style name="GeckoList.ListItem">
<item name="android:textColor">@color/select_item_multichoice</item>
<item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
<item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
@ -36,6 +39,9 @@
<item name="android:layout_height">@dimen/browser_toolbar_height</item>
<item name="android:orientation">horizontal</item>
</style>
<!-- Lists in AwesomeBar -->
<style name="AwesomeBarList" parent="@style/GeckoList"/>
<!-- ActionBar -->
<style name="ActionBar" parent="android:style/Widget.Holo.ActionBar" />

67
mobile/android/base/resources/values-v11/themes.xml
View File

@ -5,44 +5,65 @@
<resources>
<!--
Base application theme. This could be overridden by GeckoBaseTheme
in other res/values-XXX/themes.xml.
-->
<style name="GeckoBase" parent="@android:style/Theme.Holo.Light">
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="doorhangerWidth">fill_parent</item>
</style>
<style name="GeckoDialogBase" parent="@android:style/Theme.Holo.Dialog">
<style name="Gecko" parent="@android:style/Theme.Holo.Light">
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>
<style name="GeckoAwesomeBarBase" parent="GeckoBase">
<item name="android:windowBackground">@null</item>
<style name="Gecko.Dialog" parent="@android:style/Theme.Holo.Dialog">
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>
<style name="Gecko.TitleBar" parent="Gecko">
<item name="android:windowActionBar">true</item>
<item name="android:windowNoTitle">false</item>
<item name="android:actionBarStyle">@style/ActionBar.AwesomeBar</item>
</style>
<style name="GeckoPreferencesBase" parent="GeckoBase">
<item name="android:windowBackground">@color/background_normal</item>
<style name="Gecko.NoActionBar" parent="@android:style/Theme.Holo">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>
<style name="Gecko.Light" parent="@android:style/Theme.Holo.Light">
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="Gecko.Light.TitleBar" parent="Gecko.Light"/>
<style name="Gecko.Light.NoActionBar" parent="@android:style/Theme.Holo.Light">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>
<style name="Gecko.Translucent" parent="@android:style/Theme.Translucent">
<item name="android:windowActionBar">true</item>
<item name="android:windowNoTitle">false</item>
<item name="android:actionBarStyle">@style/ActionBar.GeckoPreferences</item>
</style>
<!--
Activity based themes.
-->
<style name="Gecko.App">
<item name="android:windowBackground">@color/background_normal</item>
<item name="android:panelBackground">@drawable/menu_panel_bg</item>
<item name="android:listViewStyle">@style/Widget.ListView</item>
<item name="android:dropDownListViewStyle">@style/DropDownListView</item>
<item name="android:listViewStyle">@style/GeckoList</item>
<item name="android:spinnerItemStyle">@style/SpinnerItem</item>
<item name="android:spinnerDropDownItemStyle">@style/SpinnerDropDownItem</item>
</style>
<style name="Gecko.Light.AwesomeBar">
<item name="android:actionBarStyle">@style/ActionBar.AwesomeBar</item>
<item name="android:windowBackground">@null</item>
</style>
<style name="Gecko.TitleBar.Preferences">
<item name="android:actionBarStyle">@style/ActionBar.GeckoPreferences</item>
<item name="android:windowBackground">@color/background_normal</item>
</style>
<style name="Gecko.Translucent.TabsTray">
<item name="android:actionBarStyle">@style/ActionBar.TabsTray</item>
</style>
</resources>

4
mobile/android/base/resources/values-xlarge-v11/dimens.xml
View File

@ -9,10 +9,6 @@
<dimen name="abouthome_gutter_large">40dp</dimen>
<dimen name="abouthome_icon_crop">0dp</dimen>
<dimen name="awesomebar_header_row_height">24dp</dimen>
<!-- Padding on either side of the lists in AwesomeBar -->
<dimen name="awesomebar_list_padding">52dp</dimen>
<dimen name="awesomebar_row_height">66dp</dimen>
<dimen name="awesomebar_tab_transparency_height">46dp</dimen>
<dimen name="browser_toolbar_height">56dp</dimen>

6
mobile/android/base/resources/values-xlarge-v11/styles.xml
View File

@ -10,6 +10,12 @@
Please refer to values/styles.xml for default styles.
-->
<!-- Lists in AwesomeBar -->
<style name="AwesomeBarList" parent="@style/GeckoList">
<item name="android:paddingLeft">52dp</item>
<item name="android:paddingRight">52dp</item>
</style>
<!-- AwesomeBar Tab Indicator Curve Left -->
<style name="AwesomeBarTabIndicatorCurve.Left">
<item name="android:layout_width">86dp</item>

9
mobile/android/base/resources/values/attrs.xml
View File

@ -11,15 +11,6 @@
<attr name="more_text" format="string"/>
</declare-styleable>
<!-- DoorHangers -->
<declare-styleable name="DoorHanger">
<attr name="doorhangerWidth" format="dimension">
<enum name="fill_parent" value="-1" />
<enum name="match_parent" value="-1" />
<enum name="wrap_content" value="-2" />
</attr>
</declare-styleable>
<declare-styleable name="MenuItem">
<attr name="android:id"/>
<attr name="android:orderInCategory"/>

27
mobile/android/base/resources/values/colors.xml
View File

@ -25,33 +25,6 @@
<!-- highlight-focused on menu button: 10% black over black -->
<color name="highlight_menu_focused">#FF1A1A1A</color>
<!--
Application theme colors
-->
<!-- Default colors -->
<color name="text_color_primary">#222222</color>
<color name="text_color_secondary">#666666</color>
<color name="text_color_tertiary">#9198A1</color>
<!-- Default inverse colors -->
<color name="text_color_primary_inverse">#FFFFFF</color>
<color name="text_color_secondary_inverse">#DDDDDD</color>
<color name="text_color_tertiary_inverse">#A4A7A9</color>
<!-- Disabled colors -->
<color name="text_color_primary_disable_only">#999999</color>
<!-- Hint colors -->
<color name="text_color_hint">#666666</color>
<color name="text_color_hint_inverse">#7F828A</color>
<!-- Highlight colors -->
<color name="text_color_highlight">#FF9500</color>
<color name="text_color_highlight_inverse">#D06BFF</color>
<!-- Link colors -->
<color name="text_color_link">#22629E</color>
<color name="autocomplete_listitem_text">#000000</color>
<color name="splash_background">#000000</color>
<color name="splash_msgfont">#ffffff</color>

9
mobile/android/base/resources/values/dimens.xml
View File

@ -16,10 +16,6 @@
<dimen name="autocomplete_min_width">200dp</dimen>
<dimen name="autocomplete_row_height">32dp</dimen>
<dimen name="awesomebar_header_row_height">20dp</dimen>
<!-- Padding on either side of the lists in AwesomeBar -->
<dimen name="awesomebar_list_padding">0dp</dimen>
<dimen name="awesomebar_row_height">48dp</dimen>
<dimen name="awesomebar_row_favicon_size_small">16dp</dimen>
<dimen name="awesomebar_row_favicon_size_large">32dp</dimen>
@ -31,10 +27,6 @@
<dimen name="browser_toolbar_icon_width">36dp</dimen>
<dimen name="browser_toolbar_lock_width">20dp</dimen>
<dimen name="browser_toolbar_favicon_size">29.33dip</dimen>
<!-- Max width of the doorhanger on tablets -->
<dimen name="doorhanger_width">400dp</dimen>
<dimen name="flow_layout_spacing">6dp</dimen>
<dimen name="menu_item_icon">21dp</dimen>
<dimen name="menu_item_state_icon">18dp</dimen>
@ -54,6 +46,7 @@
<dimen name="prompt_service_min_list_item_height">48dp</dimen>
<dimen name="remote_tab_child_row_height">64dp</dimen>
<dimen name="remote_tab_group_row_height">26dp</dimen>
<dimen name="popup_width">400dp</dimen>
<dimen name="tab_thumbnail_height">90dp</dimen>
<dimen name="tab_thumbnail_width">160dp</dimen>
<dimen name="tabs_counter_size">22sp</dimen>

119
mobile/android/base/resources/values/styles.xml
View File

@ -5,30 +5,16 @@
<resources>
<!--
Base application styles. This could be overridden in other res/values-XXX/themes.xml.
-->
<style name="Widget"/>
<style name="Widget.BaseListLiew" parent="android:style/Widget.ListView"/>
<!--
Application styles. All customizations that are not specific
to a particular API level can go here.
-->
<style name="Widget.ListView" parent="Widget.BaseListView">
<item name="android:divider">#D1D5DA</item>
<item name="android:dividerHeight">1dp</item>
<item name="android:cacheColorHint">#EEF1F5</item>
<item name="android:listSelector">@drawable/action_bar_button</item>
<!-- Layout -->
<style name="Layout">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
</style>
<style name="Widget.ExpandableListView" parent="Widget.ListView">
<item name="android:groupIndicator">@android:color/transparent</item>
<item name="android:childDivider">#D1D5DA</item>
<style name="GeckoList" parent="android:style/Widget.ListView">
</style>
<style name="Widget.ListItem">
<style name="GeckoList.ListItem">
<item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
<item name="android:textAppearance">?android:attr/textAppearanceLargeInverse</item>
<item name="android:gravity">center_vertical</item>
@ -38,74 +24,24 @@
<item name="android:ellipsize">marquee</item>
</style>
<!--
TextAppearance
Note: Gecko uses light theme as default, while Android uses dark.
If Android convention has to be followd, the list of colors specified
in themes.xml would be inverse, and things would get confusing.
Hence, Gecko's TextAppearance is based on text over light theme and
TextAppearance.Inverse is based on text over dark theme.
-->
<style name="TextAppearance">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlight</item>
<item name="android:textColorHint">?android:attr/textColorHint</item>
<item name="android:textColorLink">?android:attr/textColorLink</item>
<item name="android:textSize">16sp</item>
<item name="android:textStyle">normal</item>
<!-- Horizontal Layout -->
<style name="Layout.Horizontal">
<item name="android:orientation">horizontal</item>
</style>
<style name="TextAppearance.Inverse">
<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
<!-- Vertical Layout -->
<style name="Layout.Vertical">
<item name="android:orientation">vertical</item>
</style>
<style name="TextAppearance.Large">
<item name="android:textSize">22sp</item>
<!-- Screen -->
<style name="Screen" parent="Layout.Vertical">
<item name="android:background">#fff</item>
</style>
<style name="TextAppearance.Large.Inverse">
<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
</style>
<style name="TextAppearance.Medium">
<item name="android:textSize">18sp</item>
</style>
<style name="TextAppearance.Medium.Inverse">
<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
</style>
<style name="TextAppearance.Small">
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.Small.Inverse">
<item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
</style>
<style name="TextAppearance.Micro">
<item name="android:textSize">12sp</item>
<item name="android:textColor">?android:attr/textColorTertiary</item>
</style>
<style name="TextAppearance.Micro.Inverse">
<item name="android:textColor">?android:attr/textColorTertiaryInverse</item>
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
<!-- Transparent Screen -->
<style name="Screen.Transparent">
<item name="android:background">#00000000</item>
</style>
<!-- BrowserToolbar -->
@ -170,6 +106,17 @@
<item name="android:orientation">horizontal</item>
</style>
<!-- Lists in AwesomeBar -->
<style name="AwesomeBarList" parent="android:style/Widget.ListView.White">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:background">#EEF1F5</item>
<item name="android:divider">#D1D5DA</item>
<item name="android:dividerHeight">1dp</item>
<item name="android:cacheColorHint">#EEF1F5</item>
<item name="android:listSelector">@drawable/action_bar_button</item>
</style>
<!-- AwesomeBar Tab Indicator Curve -->
<style name="AwesomeBarTabIndicatorCurve">
@ -321,17 +268,19 @@
<item name="android:paddingBottom">1dip</item>
<item name="android:paddingLeft">5dip</item>
<item name="android:paddingRight">5dip</item>
<item name="android:textSize">12sp</item>
<item name="android:textSize">10sp</item>
<item name="android:gravity">center|left</item>
</style>
<style name="AboutHome.TextAppearance" />
<style name="AboutHome.TextAppearance.Title" parent="TextAppearance">
<style name="AboutHome.TextAppearance.Title">
<item name="android:textSize">15sp</item>
<item name="android:textColor">@color/abouthome_section_title</item>
</style>
<style name="AboutHome.TextAppearance.SubTitle" parent="TextAppearance.Micro">
<style name="AboutHome.TextAppearance.SubTitle">
<item name="android:textSize">12sp</item>
<item name="android:textColor">@color/abouthome_section_subtitle</item>
</style>

105
mobile/android/base/resources/values/themes.xml
View File

@ -5,86 +5,49 @@
<resources>
<!--
Base application theme. This could be overridden by GeckoBaseTheme
in other res/values-XXX/themes.xml.
-->
<style name="GeckoBase" parent="@android:style/Theme.Light">
<item name="android:windowNoTitle">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="doorhangerWidth">fill_parent</item>
</style>
<style name="GeckoDialogBase" parent="@android:style/Theme.Dialog">
<style name="Gecko" parent="@android:style/Theme.Light">
<item name="android:windowNoTitle">true</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="GeckoAwesomeBarBase" parent="GeckoBase">
<item name="android:windowNoTitle">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowBackground">@null</item>
</style>
<style name="GeckoPreferencesBase" parent="GeckoBase">
<item name="android:windowNoTitle">false</item>
<item name="android:windowBackground">@color/background_normal</item>
</style>
<!--
Application Theme. All customizations that are not specific
to a particular API level can go here.
-->
<style name="Gecko" parent="GeckoBase">
<!-- Default colors -->
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="android:textColorSecondary">@color/text_color_secondary</item>
<item name="android:textColorTertiary">@color/text_color_tertiary</item>
<!-- Default inverse colors -->
<item name="android:textColorPrimaryInverse">@color/text_color_primary_inverse</item>
<item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse</item>
<item name="android:textColorTertiaryInverse">@color/text_color_tertiary_inverse</item>
<!-- Disabled colors -->
<item name="android:textColorPrimaryDisableOnly">@color/text_color_primary_disable_only</item>
<!-- Hint colors -->
<item name="android:textColorHint">@color/text_color_hint</item>
<item name="android:textColorHintInverse">@color/text_color_hint_inverse</item>
<!-- Highlight colors -->
<item name="android:textColorHighlight">@color/text_color_highlight</item>
<item name="android:textColorHighlightInverse">@color/text_color_highlight_inverse</item>
<!-- Link colors -->
<item name="android:textColorLink">@color/text_color_link</item>
<!-- TextAppearances -->
<item name="android:textAppearance">@style/TextAppearance</item>
<item name="android:textAppearanceInverse">@style/TextAppearance.Inverse</item>
<item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
<item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
<item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
<item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
<item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
<item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
</style>
<style name="Gecko.Dialog" parent="GeckoDialogBase"/>
<style name="Gecko.Dialog" parent="@android:style/Theme.Dialog">
<item name="android:windowNoTitle">true</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="Gecko.TitleBar" parent="Gecko">
<item name="android:windowNoTitle">false</item>
</style>
<style name="Gecko.NoActionBar" parent="Gecko"/>
<style name="Gecko.Light" parent="@android:style/Theme.Light">
<item name="android:windowNoTitle">true</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="Gecko.Light.TitleBar" parent="Gecko.Light">
<item name="android:windowNoTitle">false</item>
</style>
<style name="Gecko.Light.NoActionBar" parent="Gecko.Light"/>
<style name="Gecko.Translucent" parent="@android:style/Theme.Translucent">
<item name="android:windowNoTitle">true</item>
</style>
<!--
Activity based themes.
-->
<style name="Gecko.App">
<item name="android:windowBackground">@color/background_normal</item>
</style>
<style name="Gecko.AwesomeBar" parent="GeckoAwesomeBarBase">
<item name="android:listViewStyle">@style/Widget.ListView</item>
<item name="android:expandableListViewStyle">@style/Widget.ExpandableListView</item>
<style name="Gecko.Light.AwesomeBar">
<item name="android:windowBackground">@null</item>
</style>
<style name="Gecko.Preferences" parent="GeckoPreferencesBase"/>
<style name="Gecko.TitleBar.Preferences">
<item name="android:windowBackground">@color/background_normal</item>
</style>
<style name="Gecko.Translucent.TabsTray"/>
</resources>