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

Bug 806937: Private browsing mode support for AwesomeBar. [r=mfinkle]

Browse Source 
--HG--
rename : mobile/android/base/resources/drawable/address_bar_url.xml => mobile/android/base/resources/drawable/address_bar_url.xml.in
This commit is contained in:
Sriram Ramasubramanian 2012-11-15 21:40:57 -08:00
parent 353b3f0c4a
commit 8750294ac1
32 changed files with 201 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/android/base/BrowserToolbar.java
View File

@ -56,7 +56,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
private View mAwesomeBar;
private GeckoFrameLayout mAwesomeBarRightEdge;
private BrowserToolbarBackground mAddressBarBg;
private TextView mTitle;
private GeckoTextView mTitle;
private int mTitlePadding;
private boolean mSiteSecurityVisible;
private boolean mAnimateSiteSecurity;
@ -139,7 +139,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
// pane is visible. It will affect the padding applied to the title TextView.
mTabsPaneWidth = 0;
mTitle = (TextView) mLayout.findViewById(R.id.awesome_bar_title);
mTitle = (GeckoTextView) mLayout.findViewById(R.id.awesome_bar_title);
mTitlePadding = mTitle.getPaddingRight();
if (Build.VERSION.SDK_INT >= 16)
mTitle.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
@ -787,8 +787,12 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
mAddressBarBg.setPrivateMode(tab.isPrivate());
if (mAwesomeBarRightEdge != null)
mAwesomeBarRightEdge.setPrivateMode(tab.isPrivate());
if (mAwesomeBar instanceof GeckoButton)
((GeckoButton) mAwesomeBar).setPrivateMode(tab.isPrivate());
else if (mAwesomeBar instanceof GeckoRelativeLayout)
((GeckoRelativeLayout) mAwesomeBar).setPrivateMode(tab.isPrivate());
mTitle.setPrivateMode(tab.isPrivate());
}
}

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

@ -94,6 +94,8 @@ public final class GeckoViewsFactory implements LayoutInflater.Factory {
return new GeckoImageView(context, attrs);
else if (TextUtils.equals(viewName, "LinearLayout"))
return new GeckoLinearLayout(context, attrs);
else if (TextUtils.equals(viewName, "RelativeLayout"))
return new GeckoRelativeLayout(context, attrs);
else if (TextUtils.equals(viewName, "TextView"))
return new GeckoTextView(context, attrs);
else

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

@ -195,6 +195,7 @@ FENNEC_PP_JAVA_VIEW_FILES = \
GeckoImageView.java \
GeckoFrameLayout.java \
GeckoLinearLayout.java \
GeckoRelativeLayout.java \
GeckoTextView.java \
$(NULL)
@ -219,7 +220,10 @@ FENNEC_PP_JAVA_FILES = \
$(NULL)
FENNEC_PP_XML_FILES = \
res/color/awesome_bar_title.xml \
res/color/awesome_bar_title_hint.xml \
res/drawable/address_bar_bg.xml \
res/drawable/address_bar_url.xml \
res/layout/abouthome_content.xml \
res/layout/awesomebar_search.xml \
res/layout/awesomebar_suggestion_row.xml \
@ -526,9 +530,10 @@ RES_DRAWABLE_BASE = \
res/drawable/address_bar_forward_button.xml \
res/drawable/address_bar_texture_port.png \
res/drawable/address_bar_texture_port_pb.png \
res/drawable/address_bar_url.xml \
res/drawable/address_bar_url_default.9.png \
res/drawable/address_bar_url_default_pb.9.png \
res/drawable/address_bar_url_pressed.9.png \
res/drawable/address_bar_url_pressed_pb.9.png \
res/drawable/doorhanger_arrow.png \
res/drawable/doorhanger_bg.9.png \
res/drawable/doorhanger_shadow_bg.9.png \
@ -602,7 +607,9 @@ RES_DRAWABLE_HDPI = \
res/drawable-hdpi/address_bar_texture_port.png \
res/drawable-hdpi/address_bar_texture_port_pb.png \
res/drawable-hdpi/address_bar_url_default.9.png \
res/drawable-hdpi/address_bar_url_default_pb.9.png \
res/drawable-hdpi/address_bar_url_pressed.9.png \
res/drawable-hdpi/address_bar_url_pressed_pb.9.png \
res/drawable-hdpi/doorhanger_arrow.png \
res/drawable-hdpi/doorhanger_bg.9.png \
res/drawable-hdpi/doorhanger_shadow_bg.9.png \
@ -641,7 +648,9 @@ RES_DRAWABLE_XHDPI = \
res/drawable-xhdpi/address_bar_texture_port.png \
res/drawable-xhdpi/address_bar_texture_port_pb.png \
res/drawable-xhdpi/address_bar_url_default.9.png \
res/drawable-xhdpi/address_bar_url_default_pb.9.png \
res/drawable-xhdpi/address_bar_url_pressed.9.png \
res/drawable-xhdpi/address_bar_url_pressed_pb.9.png \
res/drawable-xhdpi/alert_addon.png \
res/drawable-xhdpi/alert_app.png \
res/drawable-xhdpi/alert_download.png \
@ -803,7 +812,9 @@ RES_DRAWABLE_LAND_MDPI_V14 = \
res/drawable-land-mdpi-v14/address_bar_texture_land.png \
res/drawable-land-mdpi-v14/address_bar_texture_land_pb.png \
res/drawable-land-mdpi-v14/address_bar_url_default.9.png \
res/drawable-land-mdpi-v14/address_bar_url_default_pb.9.png \
res/drawable-land-mdpi-v14/address_bar_url_pressed.9.png \
res/drawable-land-mdpi-v14/address_bar_url_pressed_pb.9.png \
res/drawable-land-mdpi-v14/remote_tabs_off.png \
res/drawable-land-mdpi-v14/remote_tabs_on.png \
res/drawable-land-mdpi-v14/tab_new.png \
@ -821,7 +832,9 @@ RES_DRAWABLE_LAND_HDPI_V14 = \
res/drawable-land-hdpi-v14/address_bar_texture_land.png \
res/drawable-land-hdpi-v14/address_bar_texture_land_pb.png \
res/drawable-land-hdpi-v14/address_bar_url_default.9.png \
res/drawable-land-hdpi-v14/address_bar_url_default_pb.9.png \
res/drawable-land-hdpi-v14/address_bar_url_pressed.9.png \
res/drawable-land-hdpi-v14/address_bar_url_pressed_pb.9.png \
res/drawable-land-hdpi-v14/remote_tabs_off.png \
res/drawable-land-hdpi-v14/remote_tabs_on.png \
res/drawable-land-hdpi-v14/tab_new.png \
@ -839,7 +852,9 @@ RES_DRAWABLE_LAND_XHDPI_V14 = \
res/drawable-land-xhdpi-v14/address_bar_texture_land.png \
res/drawable-land-xhdpi-v14/address_bar_texture_land_pb.png \
res/drawable-land-xhdpi-v14/address_bar_url_default.9.png \
res/drawable-land-xhdpi-v14/address_bar_url_default_pb.9.png \
res/drawable-land-xhdpi-v14/address_bar_url_pressed.9.png \
res/drawable-land-xhdpi-v14/address_bar_url_pressed_pb.9.png \
res/drawable-land-xhdpi-v14/remote_tabs_off.png \
res/drawable-land-xhdpi-v14/remote_tabs_on.png \
res/drawable-land-xhdpi-v14/tab_new.png \
@ -859,7 +874,9 @@ RES_DRAWABLE_LARGE_MDPI_V11 = \
res/drawable-large-mdpi-v11/address_bar_back_button_bg.png \
res/drawable-large-mdpi-v11/address_bar_back_button_pressed_bg.png \
res/drawable-large-mdpi-v11/address_bar_url_default.9.png \
res/drawable-large-mdpi-v11/address_bar_url_default_pb.9.png \
res/drawable-large-mdpi-v11/address_bar_url_pressed.9.png \
res/drawable-large-mdpi-v11/address_bar_url_pressed_pb.9.png \
res/drawable-large-mdpi-v11/ic_awesomebar_go.png \
res/drawable-large-mdpi-v11/ic_awesomebar_search.png \
res/drawable-large-mdpi-v11/ic_menu_bookmark_add.png \
@ -883,7 +900,9 @@ RES_DRAWABLE_LARGE_HDPI_V11 = \
res/drawable-large-hdpi-v11/address_bar_back_button_bg.png \
res/drawable-large-hdpi-v11/address_bar_back_button_pressed_bg.png \
res/drawable-large-hdpi-v11/address_bar_url_default.9.png \
res/drawable-large-hdpi-v11/address_bar_url_default_pb.9.png \
res/drawable-large-hdpi-v11/address_bar_url_pressed.9.png \
res/drawable-large-hdpi-v11/address_bar_url_pressed_pb.9.png \
res/drawable-large-hdpi-v11/ic_awesomebar_go.png \
res/drawable-large-hdpi-v11/ic_awesomebar_search.png \
res/drawable-large-hdpi-v11/ic_menu_bookmark_add.png \
@ -907,7 +926,9 @@ RES_DRAWABLE_LARGE_XHDPI_V11 = \
res/drawable-large-xhdpi-v11/address_bar_back_button_bg.png \
res/drawable-large-xhdpi-v11/address_bar_back_button_pressed_bg.png \
res/drawable-large-xhdpi-v11/address_bar_url_default.9.png \
res/drawable-large-xhdpi-v11/address_bar_url_default_pb.9.png \
res/drawable-large-xhdpi-v11/address_bar_url_pressed.9.png \
res/drawable-large-xhdpi-v11/address_bar_url_pressed_pb.9.png \
res/drawable-large-xhdpi-v11/ic_awesomebar_go.png \
res/drawable-large-xhdpi-v11/ic_awesomebar_search.png \
res/drawable-large-xhdpi-v11/ic_menu_bookmark_add.png \
@ -982,7 +1003,6 @@ MOZ_ANDROID_DRAWABLES += \
mobile/android/base/resources/drawable/address_bar_bg_normal.xml \
mobile/android/base/resources/drawable/address_bar_bg_private.xml \
mobile/android/base/resources/drawable/address_bar_bg_shadow_repeat.xml \
mobile/android/base/resources/drawable/address_bar_url_level.xml \
mobile/android/base/resources/drawable/autocomplete_list_bg.9.png \
mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml \
mobile/android/base/resources/drawable/awesomebar_tab_selected.xml \

12
mobile/android/base/resources/drawable/address_bar_url.xml → mobile/android/base/resources/color/awesome_bar_title.xml.in
View File

@ -1,12 +1,16 @@
#filter substitution
<?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/. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
<item android:state_focused="true" android:drawable="@drawable/address_bar_url_pressed"/>
<item android:state_pressed="true" android:drawable="@drawable/address_bar_url_pressed"/>
<item android:drawable="@drawable/address_bar_url_default"/>
<!-- private browsing mode -->
<item gecko:state_private="true" android:color="#FFDDDDDD" />
<!-- normal mode -->
<item android:color="#FF222222"/>
</selector>

16
mobile/android/base/resources/color/awesome_bar_title_hint.xml.in Normal file
View File

@ -0,0 +1,16 @@
#filter substitution
<?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/. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
<!-- private browsing mode -->
<item gecko:state_private="true" android:color="#FF7F828A" />
<!-- normal mode -->
<item android:color="#FF666666"/>
</selector>

BIN
mobile/android/base/resources/drawable-hdpi/address_bar_url_default_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
mobile/android/base/resources/drawable-hdpi/address_bar_url_pressed_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_default_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_pressed_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_default_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 857 B

BIN
mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_pressed_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1000 B

BIN
mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_default_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_pressed_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_default_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_pressed_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_default_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_pressed_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_default_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_pressed_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
mobile/android/base/resources/drawable-xhdpi/address_bar_url_default_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
mobile/android/base/resources/drawable-xhdpi/address_bar_url_pressed_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

31
mobile/android/base/resources/drawable/address_bar_url.xml.in Normal file
View File

@ -0,0 +1,31 @@
#filter substitution
<?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/. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
<!-- private browsing mode -->
<item gecko:state_private="true"
android:state_focused="true"
android:drawable="@drawable/address_bar_url_pressed_pb"/>
<item gecko:state_private="true"
android:state_pressed="true"
android:drawable="@drawable/address_bar_url_pressed_pb"/>
<item gecko:state_private="true"
android:drawable="@drawable/address_bar_url_default_pb"/>
<!-- normal modes -->
<item android:state_focused="true"
android:drawable="@drawable/address_bar_url_pressed"/>
<item android:state_pressed="true"
android:drawable="@drawable/address_bar_url_pressed"/>
<item android:drawable="@drawable/address_bar_url_default"/>
</selector>

BIN
mobile/android/base/resources/drawable/address_bar_url_default_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 975 B

12
mobile/android/base/resources/drawable/address_bar_url_level.xml
View File

@ -1,12 +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/. -->
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:maxLevel="0" android:drawable="@drawable/address_bar_url"/>
<item android:maxLevel="1" android:drawable="@color/private_browsing_color"/>
</level-list>

BIN
mobile/android/base/resources/drawable/address_bar_url_pressed_pb.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

29
mobile/android/base/resources/layout-land-v14/browser_toolbar.xml.in
View File

@ -65,9 +65,9 @@
android:layout_alignParentBottom="true"
android:layout_centerVertical="true">
<Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:background="@drawable/address_bar_url_level"/>
<Gecko.Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:background="@drawable/address_bar_url"/>
<LinearLayout style="@style/AddressBar.Button"
android:orientation="horizontal">
@ -93,17 +93,18 @@
android:contentDescription="@string/site_security"
android:visibility="gone"/>
<TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="#222222"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<Gecko.TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="@color/awesome_bar_title"
android:textColorHint="@color/awesome_bar_title_hint"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<ImageButton android:id="@+id/reader"
style="@style/AddressBar.ImageButton.Icon"

29
mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml.in
View File

@ -73,9 +73,9 @@
android:layout_alignParentBottom="true"
android:layout_centerVertical="true">
<Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:background="@drawable/address_bar_url_level"/>
<Gecko.Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:background="@drawable/address_bar_url"/>
<LinearLayout style="@style/AddressBar.Button"
android:orientation="horizontal">
@ -101,17 +101,18 @@
android:contentDescription="@string/site_security"
android:visibility="gone"/>
<TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.ImageButton"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="#222222"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<Gecko.TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.ImageButton"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="@color/awesome_bar_title"
android:textColorHint="@color/awesome_bar_title_hint"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<ImageButton android:id="@+id/reader"
style="@style/AddressBar.ImageButton.Icon"

37
mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in
View File

@ -65,13 +65,13 @@
android:layout_alignParentBottom="true"
android:layout_centerVertical="true">
<Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:layout_marginLeft="20dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:layout_marginRight="0dp"
android:background="@drawable/address_bar_url_level"/>
<Gecko.Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:layout_marginLeft="20dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:layout_marginRight="0dp"
android:background="@drawable/address_bar_url"/>
<ImageButton android:id="@+id/forward"
style="@style/AddressBar.ImageButton"
@ -120,17 +120,18 @@
android:contentDescription="@string/site_security"
android:visibility="gone"/>
<TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="#222222"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<Gecko.TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="@color/awesome_bar_title"
android:textColorHint="@color/awesome_bar_title_hint"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<ImageButton android:id="@+id/reader"
style="@style/AddressBar.ImageButton.Icon"

69
mobile/android/base/resources/layout-xlarge-v11/browser_toolbar_menu.xml.in
View File

@ -64,21 +64,21 @@
android:layout_alignParentBottom="true"
android:layout_centerVertical="true">
<RelativeLayout android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:layout_centerVertical="true"
android:clickable="true"
android:focusable="true">
<Gecko.RelativeLayout android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:layout_centerVertical="true"
android:clickable="true"
android:focusable="true">
<ImageView style="@style/AddressBar.Button"
android:layout_marginLeft="20dp"
android:layout_marginRight="0dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:duplicateParentState="true"
android:clickable="false"
android:focusable="false"
android:background="@drawable/address_bar_url"/>
<Gecko.ImageView style="@style/AddressBar.Button"
android:layout_marginLeft="20dp"
android:layout_marginRight="0dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:duplicateParentState="true"
android:clickable="false"
android:focusable="false"
android:background="@drawable/address_bar_url"/>
<view class="org.mozilla.gecko.BrowserToolbar$RightEdge"
android:id="@+id/awesome_bar_right_edge"
@ -91,18 +91,18 @@
android:layout_alignParentRight="true"
android:duplicateParentState="true">
<ImageView android:layout_width="50dp"
android:layout_height="fill_parent"
android:scaleType="fitXY"
android:layout_marginLeft="-26dp"
android:duplicateParentState="true"
android:clickable="false"
android:focusable="false"
android:src="@drawable/address_bar_url"/>
<Gecko.ImageView android:layout_width="50dp"
android:layout_height="fill_parent"
android:scaleType="fitXY"
android:layout_marginLeft="-26dp"
android:duplicateParentState="true"
android:clickable="false"
android:focusable="false"
android:src="@drawable/address_bar_url"/>
</view>
</RelativeLayout>
</Gecko.RelativeLayout>
<ImageButton android:id="@+id/forward"
style="@style/AddressBar.ImageButton"
@ -150,17 +150,18 @@
android:contentDescription="@string/site_security"
android:visibility="gone"/>
<TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="#222222"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<Gecko.TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="@color/awesome_bar_title"
android:textColorHint="@color/awesome_bar_title_hint"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<ImageButton android:id="@+id/reader"
style="@style/AddressBar.ImageButton.Icon"

29
mobile/android/base/resources/layout/browser_toolbar.xml.in
View File

@ -65,9 +65,9 @@
android:layout_alignParentBottom="true"
android:layout_centerVertical="true">
<Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:background="@drawable/address_bar_url_level"/>
<Gecko.Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:background="@drawable/address_bar_url"/>
<LinearLayout style="@style/AddressBar.Button"
android:orientation="horizontal">
@ -91,17 +91,18 @@
android:contentDescription="@string/site_security"
android:visibility="gone"/>
<TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="#222222"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<Gecko.TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="@color/awesome_bar_title"
android:textColorHint="@color/awesome_bar_title_hint"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<ImageButton android:id="@+id/reader"
style="@style/AddressBar.ImageButton.Icon"

29
mobile/android/base/resources/layout/browser_toolbar_menu.xml.in
View File

@ -74,9 +74,9 @@
android:layout_alignParentBottom="true"
android:layout_centerVertical="true">
<Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:background="@drawable/address_bar_url_level"/>
<Gecko.Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:background="@drawable/address_bar_url"/>
<LinearLayout style="@style/AddressBar.Button"
android:orientation="horizontal">
@ -100,17 +100,18 @@
android:contentDescription="@string/site_security"
android:visibility="gone"/>
<TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="#222222"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<Gecko.TextView android:id="@+id/awesome_bar_title"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="@color/awesome_bar_title"
android:textColorHint="@color/awesome_bar_title_hint"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:layout_gravity="center_vertical"/>
<ImageButton android:id="@+id/reader"
style="@style/AddressBar.ImageButton.Icon"

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

@ -16,7 +16,6 @@
<color name="url_bar_text_highlight">#FF9500</color>
<color name="suggestion_primary">#dddddd</color>
<color name="suggestion_pressed">#bbbbbb</color>
<color name="private_browsing_color">#993399</color>
<color name="abouthome_topsite_shadow">#1000</color>
</resources>