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 769237: Move the overflow menu to the right in XHDPI ICS devices. [r=mfinkle]

Browse Source 
--HG--
extra : rebase_source : a4f61f77bd707087fec9926de29dfa92b3c6f49b
This commit is contained in:
Sriram Ramasubramanian 2012-07-09 13:21:20 -07:00
parent 943b321364
commit 5291c70881
62 changed files with 501 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,6 +237,9 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
mMenu.setVisibility(View.VISIBLE);
mMenu.setOnClickListener(new Button.OnClickListener() {
public void onClick(View view) {
if (!GeckoApp.mAppContext.isTablet() && GeckoApp.mAppContext.areTabsShown())
return;
GeckoApp.mAppContext.openOptionsMenu();
}
});
@ -328,7 +331,8 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
private void toggleTabs() {
if (GeckoApp.mAppContext.areTabsShown()) {
GeckoApp.mAppContext.hideTabs();
if (GeckoApp.mAppContext.isTablet())
GeckoApp.mAppContext.hideTabs();
} else {
// hide the virtual keyboard
InputMethodManager imm =
@ -375,11 +379,25 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
public void updateTabs(boolean areTabsShown) {
if (areTabsShown) {
mTabs.setImageLevel(TABS_EXPANDED);
mTabs.getBackground().setLevel(TABS_EXPANDED);
if (!GeckoApp.mAppContext.isTablet()) {
mTabs.setImageLevel(0);
mTabsCount.setVisibility(View.GONE);
mMenu.setImageLevel(TABS_EXPANDED);
mMenu.getBackground().setLevel(TABS_EXPANDED);
} else {
mTabs.setImageLevel(TABS_EXPANDED);
}
} else {
mTabs.setImageLevel(TABS_CONTRACTED);
mTabs.getBackground().setLevel(TABS_CONTRACTED);
if (!GeckoApp.mAppContext.isTablet()) {
mTabsCount.setVisibility(View.VISIBLE);
mMenu.setImageLevel(TABS_CONTRACTED);
mMenu.getBackground().setLevel(TABS_CONTRACTED);
}
}
}

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

@ -293,8 +293,14 @@ RES_LAYOUT = \
res/layout/validation_message.xml \
$(NULL)
RES_LAYOUT_V14 = \
res/layout-v14/browser_toolbar.xml \
res/layout-v14/tabs_panel_toolbar.xml \
$(NULL)
RES_LAYOUT_LAND_V14 = \
res/layout-land-v14/browser_toolbar.xml \
res/layout-land-v14/tabs_panel_toolbar.xml \
$(NULL)
RES_LAYOUT_XLARGE = \
@ -411,12 +417,12 @@ RES_DRAWABLE_BASE = \
res/drawable/tabs_carat_contracted.png \
res/drawable/tabs_carat_expanded.png \
res/drawable/tabs_expanded_normal.png \
res/drawable/tabs_expanded_pressed.png \
res/drawable/tabs_normal.png \
res/drawable/tabs_pressed.png \
res/drawable/address_bar_back_button.xml \
res/drawable/address_bar_back_button_bg.xml \
res/drawable/address_bar_back_button_pressed_bg.xml \
res/drawable/address_bar_bg_curve.png \
res/drawable/address_bar_forward_button.xml \
res/drawable/address_bar_texture_port.png \
res/drawable/address_bar_url.xml \
@ -493,9 +499,9 @@ RES_DRAWABLE_HDPI = \
res/drawable-hdpi/tabs_carat_contracted.png \
res/drawable-hdpi/tabs_carat_expanded.png \
res/drawable-hdpi/tabs_expanded_normal.png \
res/drawable-hdpi/tabs_expanded_pressed.png \
res/drawable-hdpi/tabs_normal.png \
res/drawable-hdpi/tabs_pressed.png \
res/drawable-hdpi/address_bar_bg_curve.png \
res/drawable-hdpi/address_bar_texture_port.png \
res/drawable-hdpi/address_bar_url_default.9.png \
res/drawable-hdpi/address_bar_url_pressed.9.png \
@ -579,6 +585,7 @@ RES_DRAWABLE_XHDPI_V11 = \
res/drawable-xhdpi-v11/abouthome_sync_bg.9.png \
res/drawable-xhdpi-v11/abouthome_sync_pressed_bg.9.png \
res/drawable-xhdpi-v11/abouthome_thumbnail.png \
res/drawable-xhdpi-v11/address_bar_bg_curve.png \
res/drawable-xhdpi-v11/address_bar_bg_shadow.png \
res/drawable-xhdpi-v11/alert_addon.png \
res/drawable-xhdpi-v11/alert_app.png \
@ -606,12 +613,13 @@ RES_DRAWABLE_XHDPI_V11 = \
res/drawable-xhdpi-v11/remote_tabs_on.png \
res/drawable-xhdpi-v11/tab_new.png \
res/drawable-xhdpi-v11/tab_close.png \
res/drawable-xhdpi-v11/tab_new_normal.png \
res/drawable-xhdpi-v11/tab_new_pressed.png \
res/drawable-xhdpi-v11/tab_thumbnail_default.png \
res/drawable-xhdpi-v11/tab_thumbnail_shadow.png \
res/drawable-xhdpi-v11/tabs_carat_contracted.png \
res/drawable-xhdpi-v11/tabs_carat_expanded.png \
res/drawable-xhdpi-v11/tabs_expanded_normal.png \
res/drawable-xhdpi-v11/tabs_expanded_pressed.png \
res/drawable-xhdpi-v11/tabs_normal.png \
res/drawable-xhdpi-v11/tabs_pressed.png \
res/drawable-xhdpi-v11/address_bar_texture_port.png \
@ -629,7 +637,8 @@ RES_DRAWABLE_XHDPI_V11 = \
res/drawable-xhdpi-v11/reading_list.png \
res/drawable-xhdpi-v11/larry_blue.png \
res/drawable-xhdpi-v11/larry_green.png \
res/drawable-xhdpi-v11/menu.png \
res/drawable-xhdpi-v11/menu_normal.png \
res/drawable-xhdpi-v11/menu_pressed.png \
res/drawable-xhdpi-v11/menu_panel_bg.9.png \
res/drawable-xhdpi-v11/menu_popup_bg.9.png \
res/drawable-xhdpi-v11/menu_popup_arrow.png \
@ -643,6 +652,17 @@ RES_DRAWABLE_XHDPI_V11 = \
res/drawable-xhdpi-v11/validation_bg.9.png \
$(NULL)
RES_DRAWABLE_XHDPI_V14 = \
res/drawable-xhdpi-v14/menu.png \
res/drawable-xhdpi-v14/menu_normal.png \
res/drawable-xhdpi-v14/menu_pressed.png \
res/drawable-xhdpi-v14/tab_new_normal.png \
res/drawable-xhdpi-v14/tab_new_pressed.png \
res/drawable-xhdpi-v14/tabs_expanded_normal.png \
res/drawable-xhdpi-v14/tabs_normal.png \
res/drawable-xhdpi-v14/tabs_pressed.png \
$(NULL)
RES_DRAWABLE_LAND_V14 = \
res/drawable-land-v14/address_bar_bg.xml \
$(NULL)
@ -650,6 +670,7 @@ RES_DRAWABLE_LAND_V14 = \
RES_DRAWABLE_LAND_MDPI_V14 = \
res/drawable-land-mdpi-v14/ic_awesomebar_go.png \
res/drawable-land-mdpi-v14/ic_awesomebar_search.png \
res/drawable-land-mdpi-v14/address_bar_bg_curve.png \
res/drawable-land-mdpi-v14/address_bar_texture_land.png \
res/drawable-land-mdpi-v14/address_bar_url_default.9.png \
res/drawable-land-mdpi-v14/address_bar_url_pressed.9.png \
@ -659,7 +680,6 @@ RES_DRAWABLE_LAND_MDPI_V14 = \
res/drawable-land-mdpi-v14/tabs_carat_contracted.png \
res/drawable-land-mdpi-v14/tabs_carat_expanded.png \
res/drawable-land-mdpi-v14/tabs_expanded_normal.png \
res/drawable-land-mdpi-v14/tabs_expanded_pressed.png \
res/drawable-land-mdpi-v14/tabs_normal.png \
res/drawable-land-mdpi-v14/tabs_pressed.png \
res/drawable-land-mdpi-v14/urlbar_stop.png \
@ -671,6 +691,7 @@ RES_DRAWABLE_LAND_MDPI_V14 = \
RES_DRAWABLE_LAND_HDPI_V14 = \
res/drawable-land-hdpi-v14/ic_awesomebar_go.png \
res/drawable-land-hdpi-v14/ic_awesomebar_search.png \
res/drawable-land-hdpi-v14/address_bar_bg_curve.png \
res/drawable-land-hdpi-v14/address_bar_texture_land.png \
res/drawable-land-hdpi-v14/address_bar_url_default.9.png \
res/drawable-land-hdpi-v14/address_bar_url_pressed.9.png \
@ -680,7 +701,6 @@ RES_DRAWABLE_LAND_HDPI_V14 = \
res/drawable-land-hdpi-v14/tabs_carat_contracted.png \
res/drawable-land-hdpi-v14/tabs_carat_expanded.png \
res/drawable-land-hdpi-v14/tabs_expanded_normal.png \
res/drawable-land-hdpi-v14/tabs_expanded_pressed.png \
res/drawable-land-hdpi-v14/tabs_normal.png \
res/drawable-land-hdpi-v14/tabs_pressed.png \
res/drawable-land-hdpi-v14/urlbar_stop.png \
@ -692,6 +712,7 @@ RES_DRAWABLE_LAND_HDPI_V14 = \
RES_DRAWABLE_LAND_XHDPI_V14 = \
res/drawable-land-xhdpi-v14/ic_awesomebar_go.png \
res/drawable-land-xhdpi-v14/ic_awesomebar_search.png \
res/drawable-land-xhdpi-v14/address_bar_bg_curve.png \
res/drawable-land-xhdpi-v14/address_bar_texture_land.png \
res/drawable-land-xhdpi-v14/address_bar_url_default.9.png \
res/drawable-land-xhdpi-v14/address_bar_url_pressed.9.png \
@ -701,10 +722,12 @@ RES_DRAWABLE_LAND_XHDPI_V14 = \
res/drawable-land-xhdpi-v14/tabs_carat_contracted.png \
res/drawable-land-xhdpi-v14/tabs_carat_expanded.png \
res/drawable-land-xhdpi-v14/tabs_expanded_normal.png \
res/drawable-land-xhdpi-v14/tabs_expanded_pressed.png \
res/drawable-land-xhdpi-v14/tabs_normal.png \
res/drawable-land-xhdpi-v14/tabs_pressed.png \
res/drawable-land-xhdpi-v14/urlbar_stop.png \
res/drawable-land-xhdpi-v14/menu.png \
res/drawable-land-xhdpi-v14/menu_normal.png \
res/drawable-land-xhdpi-v14/menu_pressed.png \
res/drawable-land-xhdpi-v14/reader.png \
res/drawable-land-xhdpi-v14/site_security_identified.png \
res/drawable-land-xhdpi-v14/site_security_verified.png \
@ -715,6 +738,7 @@ RES_DRAWABLE_XLARGE_MDPI = \
res/drawable-xlarge-mdpi/address_bar_texture_tablet.png \
res/drawable-xlarge-mdpi/address_bar_back_button_bg.png \
res/drawable-xlarge-mdpi/address_bar_back_button_pressed_bg.png \
res/drawable-xlarge-mdpi/address_bar_bg_curve.png \
res/drawable-xlarge-mdpi/address_bar_url_default.9.png \
res/drawable-xlarge-mdpi/address_bar_url_pressed.9.png \
res/drawable-xlarge-mdpi/awesomebar_tab_center.9.png \
@ -730,6 +754,7 @@ RES_DRAWABLE_XLARGE_MDPI = \
res/drawable-xlarge-mdpi/remote_tabs_off.png \
res/drawable-xlarge-mdpi/remote_tabs_on.png \
res/drawable-xlarge-mdpi/tab_new.png \
res/drawable-xlarge-mdpi/tabs_button_expanded.xml \
res/drawable-xlarge-mdpi/tabs_carat_contracted.png \
res/drawable-xlarge-mdpi/tabs_carat_expanded.png \
res/drawable-xlarge-mdpi/tabs_expanded_normal.png \
@ -746,6 +771,7 @@ RES_DRAWABLE_XLARGE_HDPI = \
res/drawable-xlarge-hdpi/address_bar_texture_tablet.png \
res/drawable-xlarge-hdpi/address_bar_back_button_bg.png \
res/drawable-xlarge-hdpi/address_bar_back_button_pressed_bg.png \
res/drawable-xlarge-hdpi/address_bar_bg_curve.png \
res/drawable-xlarge-hdpi/address_bar_url_default.9.png \
res/drawable-xlarge-hdpi/address_bar_url_pressed.9.png \
res/drawable-xlarge-hdpi/awesomebar_tab_center.9.png \
@ -777,6 +803,7 @@ RES_DRAWABLE_XLARGE_XHDPI = \
res/drawable-xlarge-xhdpi/address_bar_texture_tablet.png \
res/drawable-xlarge-xhdpi/address_bar_back_button_bg.png \
res/drawable-xlarge-xhdpi/address_bar_back_button_pressed_bg.png \
res/drawable-xlarge-xhdpi/address_bar_bg_curve.png \
res/drawable-xlarge-xhdpi/address_bar_url_default.9.png \
res/drawable-xlarge-xhdpi/address_bar_url_pressed.9.png \
res/drawable-xlarge-xhdpi/awesomebar_tab_center.9.png \
@ -809,6 +836,7 @@ RES_DRAWABLE_SW600DP_MDPI = \
res/drawable-sw600dp-mdpi/address_bar_texture_tablet.png \
res/drawable-sw600dp-mdpi/address_bar_back_button_bg.png \
res/drawable-sw600dp-mdpi/address_bar_back_button_pressed_bg.png \
res/drawable-sw600dp-mdpi/address_bar_bg_curve.png \
res/drawable-sw600dp-mdpi/address_bar_url_default.9.png \
res/drawable-sw600dp-mdpi/address_bar_url_pressed.9.png \
res/drawable-sw600dp-mdpi/awesomebar_tab_center.9.png \
@ -824,6 +852,7 @@ RES_DRAWABLE_SW600DP_MDPI = \
res/drawable-sw600dp-mdpi/remote_tabs_off.png \
res/drawable-sw600dp-mdpi/remote_tabs_on.png \
res/drawable-sw600dp-mdpi/tab_new.png \
res/drawable-sw600dp-mdpi/tabs_button_expanded.xml \
res/drawable-sw600dp-mdpi/tabs_carat_contracted.png \
res/drawable-sw600dp-mdpi/tabs_carat_expanded.png \
res/drawable-sw600dp-mdpi/tabs_expanded_normal.png \
@ -840,6 +869,7 @@ RES_DRAWABLE_SW600DP_HDPI = \
res/drawable-sw600dp-hdpi/address_bar_texture_tablet.png \
res/drawable-sw600dp-hdpi/address_bar_back_button_bg.png \
res/drawable-sw600dp-hdpi/address_bar_back_button_pressed_bg.png \
res/drawable-sw600dp-hdpi/address_bar_bg_curve.png \
res/drawable-sw600dp-hdpi/address_bar_url_default.9.png \
res/drawable-sw600dp-hdpi/address_bar_url_pressed.9.png \
res/drawable-sw600dp-hdpi/awesomebar_tab_center.9.png \
@ -871,6 +901,7 @@ RES_DRAWABLE_SW600DP_XHDPI = \
res/drawable-sw600dp-xhdpi/address_bar_texture_tablet.png \
res/drawable-sw600dp-xhdpi/address_bar_back_button_bg.png \
res/drawable-sw600dp-xhdpi/address_bar_back_button_pressed_bg.png \
res/drawable-sw600dp-xhdpi/address_bar_bg_curve.png \
res/drawable-sw600dp-xhdpi/address_bar_url_default.9.png \
res/drawable-sw600dp-xhdpi/address_bar_url_pressed.9.png \
res/drawable-sw600dp-xhdpi/awesomebar_tab_center.9.png \
@ -924,8 +955,8 @@ MOZ_ANDROID_DRAWABLES += \
mobile/android/base/resources/drawable/abouthome_bg_repeat.xml \
mobile/android/base/resources/drawable/abouthome_sync_box.xml \
mobile/android/base/resources/drawable/abouthome_topsites_bg_repeat.xml \
mobile/android/base/resources/drawable/address_bar_bg.xml \
mobile/android/base/resources/drawable/action_bar_button.xml \
mobile/android/base/resources/drawable/address_bar_bg.xml \
mobile/android/base/resources/drawable/address_bar_bg_shadow.png \
mobile/android/base/resources/drawable/address_bar_bg_shadow_repeat.xml \
mobile/android/base/resources/drawable/autocomplete_list_bg.9.png \
@ -934,6 +965,8 @@ MOZ_ANDROID_DRAWABLES += \
mobile/android/base/resources/drawable/awesomebar_tab_unselected.xml \
mobile/android/base/resources/drawable/desktop_notification.png \
mobile/android/base/resources/drawable/highlight.xml \
mobile/android/base/resources/drawable/menu_button.xml \
mobile/android/base/resources/drawable/menu_level.xml \
mobile/android/base/resources/drawable/progress_spinner.xml \
mobile/android/base/resources/drawable/progress_spinner_1.png \
mobile/android/base/resources/drawable/progress_spinner_2.png \
@ -951,6 +984,7 @@ MOZ_ANDROID_DRAWABLES += \
mobile/android/base/resources/drawable/start.png \
mobile/android/base/resources/drawable/site_security_level.xml \
mobile/android/base/resources/drawable/suggestion_selector.xml \
mobile/android/base/resources/drawable/tab_new_button.xml \
mobile/android/base/resources/drawable/tabs_button.xml \
mobile/android/base/resources/drawable/tabs_button_contracted.xml \
mobile/android/base/resources/drawable/tabs_button_expanded.xml \
@ -960,15 +994,17 @@ MOZ_ANDROID_DRAWABLES += \
mobile/android/base/resources/drawable/tabs_tray_active_selector.xml \
mobile/android/base/resources/drawable/tabs_tray_default_selector.xml \
mobile/android/base/resources/drawable/tabs_tray_list_divider.xml \
mobile/android/base/resources/drawable/tabs_shadow.xml \
mobile/android/base/resources/drawable/shadow.png \
$(NULL)
MOZ_ANDROID_DRAWABLES += $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' '; fi)
RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LAND_V14) $(RES_LAYOUT_XLARGE) $(RES_LAYOUT_SW600DP) $(RES_VALUES) $(RES_VALUES_V11) $(RES_VALUES_XLARGE) $(RES_VALUES_SW600DP) $(RES_VALUES_LAND_V14) $(RES_VALUES_SW600DP_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_BASE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_V14) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_XLARGE_MDPI) $(RES_DRAWABLE_XLARGE_HDPI) $(RES_DRAWABLE_XLARGE_XHDPI) $(RES_DRAWABLE_SW600DP_MDPI) $(RES_DRAWABLE_SW600DP_HDPI) $(RES_DRAWABLE_SW600DP_XHDPI) $(RES_COLOR) $(RES_MENU) $(RES_RAW)
RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_V14) $(RES_LAYOUT_LAND_V14) $(RES_LAYOUT_XLARGE) $(RES_LAYOUT_SW600DP) $(RES_VALUES) $(RES_VALUES_V11) $(RES_VALUES_XLARGE) $(RES_VALUES_SW600DP) $(RES_VALUES_LAND_V14) $(RES_VALUES_SW600DP_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_BASE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_XHDPI_V14) $(RES_DRAWABLE_LAND_V14) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_XLARGE_MDPI) $(RES_DRAWABLE_XLARGE_HDPI) $(RES_DRAWABLE_XLARGE_XHDPI) $(RES_DRAWABLE_SW600DP_MDPI) $(RES_DRAWABLE_SW600DP_HDPI) $(RES_DRAWABLE_SW600DP_XHDPI) $(RES_COLOR) $(RES_MENU) $(RES_RAW)
RES_DIRS= \
res/layout \
res/layout-v14 \
res/layout-land-v14 \
res/layout-xlarge \
res/layout-sw600dp \
@ -985,11 +1021,10 @@ RES_DIRS= \
res/drawable-mdpi \
res/drawable-hdpi \
res/drawable \
res/drawable-mdpi-v9 \
res/drawable-hdpi-v9 \
res/drawable-mdpi-v11 \
res/drawable-hdpi-v11 \
res/drawable-xhdpi-v11 \
res/drawable-xhdpi-v14 \
res/drawable-land-v14 \
res/drawable-land-mdpi-v14 \
res/drawable-land-hdpi-v14 \

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
mobile/android/base/resources/drawable-hdpi/tabs_expanded_normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
mobile/android/base/resources/drawable-hdpi/tabs_expanded_pressed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
mobile/android/base/resources/drawable-land-hdpi-v14/tabs_expanded_normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
mobile/android/base/resources/drawable-land-hdpi-v14/tabs_expanded_pressed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
mobile/android/base/resources/drawable-land-mdpi-v14/tabs_expanded_normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
mobile/android/base/resources/drawable-land-mdpi-v14/tabs_expanded_pressed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_expanded_normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_expanded_pressed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.8 KiB

BIN
mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
mobile/android/base/resources/drawable-sw600dp-hdpi/address_bar_bg_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
mobile/android/base/resources/drawable-sw600dp-mdpi/address_bar_bg_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

11
mobile/android/base/resources/drawable-sw600dp-mdpi/tabs_button_expanded.xml Normal file
View File

@ -0,0 +1,11 @@
<?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">
<item android:state_pressed="true" android:drawable="@drawable/tabs_expanded_pressed"/>
<item android:drawable="@drawable/tabs_expanded_normal"/>
</selector>

BIN
mobile/android/base/resources/drawable-sw600dp-xhdpi/address_bar_bg_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
mobile/android/base/resources/drawable-xhdpi-v11/menu.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
mobile/android/base/resources/drawable-xhdpi-v11/tabs_expanded_normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
mobile/android/base/resources/drawable-xhdpi-v11/tabs_expanded_pressed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
mobile/android/base/resources/drawable-xhdpi-v11/tabs_normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
mobile/android/base/resources/drawable-xhdpi-v11/tabs_pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
mobile/android/base/resources/drawable-xhdpi-v14/menu.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-xhdpi-v14/menu_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_bg_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_bg_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

11
mobile/android/base/resources/drawable-xlarge-mdpi/tabs_button_expanded.xml Normal file
View File

@ -0,0 +1,11 @@
<?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">
<item android:state_pressed="true" android:drawable="@drawable/tabs_expanded_pressed"/>
<item android:drawable="@drawable/tabs_expanded_normal"/>
</selector>

BIN
mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_bg_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

17
mobile/android/base/resources/drawable/menu_button.xml Normal file
View File

@ -0,0 +1,17 @@
<?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="1">
<selector>
<item android:state_pressed="true" android:drawable="@drawable/menu_pressed"/>
<item android:drawable="@drawable/menu_normal"/>
</selector>
</item>
<item android:maxLevel="2" android:drawable="@android:color/transparent"/>
</level-list>

12
mobile/android/base/resources/drawable/menu_level.xml Normal file
View File

@ -0,0 +1,12 @@
<?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="1" android:drawable="@drawable/menu"/>
<item android:maxLevel="2" android:drawable="@android:color/transparent"/>
</level-list>

11
mobile/android/base/resources/drawable/tab_new_button.xml Normal file
View File

@ -0,0 +1,11 @@
<?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">
<item android:state_pressed="true" android:drawable="@drawable/tab_new_pressed"/>
<item android:drawable="@drawable/tab_new_normal"/>
</selector>

2
mobile/android/base/resources/drawable/tabs_button_expanded.xml
View File

@ -5,7 +5,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/tabs_expanded_pressed"/>
<item android:state_pressed="true" android:drawable="@drawable/tabs_expanded_normal"/>
<item android:drawable="@drawable/tabs_expanded_normal"/>
</selector>

14
mobile/android/base/resources/drawable/tabs_shadow.xml Normal file
View File

@ -0,0 +1,14 @@
<?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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:angle="90"
android:startColor="#00000000"
android:endColor="#40000000"
android:type="linear"/>
</shape>

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

@ -8,8 +8,7 @@
style="@style/BrowserToolbar">
<RelativeLayout android:id="@+id/address_bar"
style="@style/AddressBar"
android:background="@drawable/address_bar_bg">
style="@style/AddressBar">
<ImageButton android:id="@+id/back"
android:contentDescription="@string/back"
@ -24,40 +23,59 @@
android:layout_height="0dip"
android:visibility="gone"/>
<ImageView android:id="@+id/spacer"
style="@style/AddressBar.ImageButton"
android:layout_width="44dip"
android:layout_alignParentRight="true"/>
<View android:id="@+id/spacer_menu"
style="@style/AddressBar.ImageButton"
android:layout_width="15dip"
android:layout_alignParentRight="true"/>
<View android:id="@+id/spacer_tabs"
style="@style/AddressBar.ImageButton"
android:layout_width="75dip"
android:layout_alignParentRight="true"/>
<View android:id="@+id/curve"
android:layout_width="45dip"
android:layout_height="fill_parent"
android:layout_marginRight="50dip"
android:layout_alignParentRight="true"
android:background="@drawable/address_bar_bg_curve"/>
<View android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/curve"
android:background="@drawable/address_bar_bg"/>
<ImageButton android:id="@+id/menu"
style="@style/AddressBar.ImageButton"
android:layout_width="65dip"
android:layout_alignParentRight="true"
android:gravity="center_vertical"
android:src="@drawable/menu_level"
android:contentDescription="@string/menu"
android:background="@drawable/menu_button"
android:paddingLeft="35dip"
android:paddingRight="10dip"
android:visibility="gone"/>
<ImageButton android:id="@+id/tabs"
style="@style/AddressBar.ImageButton"
android:layout_width="60dip"
android:layout_alignParentRight="true"
android:layout_width="80dip"
android:layout_toLeftOf="@+id/spacer_menu"
android:background="@drawable/tabs_button"
android:gravity="center_vertical"
android:src="@drawable/tabs_level"
android:paddingLeft="31dip"
android:paddingRight="9dip"/>
android:paddingLeft="30dip"
android:paddingRight="30dip"/>
<TextSwitcher android:id="@+id/tabs_count"
style="@style/AddressBar.ImageButton"
android:layout_width="38.5dip"
android:layout_width="80dip"
android:layout_height="wrap_content"
android:layout_marginTop="4.5dp"
android:layout_alignRight="@id/tabs"
android:gravity="center_horizontal"/>
<ImageButton android:id="@+id/menu"
style="@style/AddressBar.ImageButton"
android:layout_width="@dimen/browser_toolbar_height"
android:layout_toLeftOf="@id/spacer"
android:gravity="center_vertical"
android:src="@drawable/menu"
android:contentDescription="@string/menu"
android:background="@drawable/action_bar_button"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:visibility="gone"/>
<Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
@ -68,7 +86,7 @@
android:layout_marginRight="4dp"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/menu"
android:layout_toLeftOf="@id/spacer_tabs"
android:layout_centerVertical="true"
android:background="@drawable/address_bar_url"
android:singleLine="true"

65
mobile/android/base/resources/layout-land-v14/tabs_panel_toolbar.xml Normal file
View File

@ -0,0 +1,65 @@
<?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/. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ImageButton android:id="@+id/menu"
style="@style/AddressBar.ImageButton"
android:layout_width="65dip"
android:layout_alignParentRight="true"
android:gravity="center_vertical"
android:src="@drawable/menu"
android:contentDescription="@string/menu"
android:background="@drawable/menu_normal"
android:paddingLeft="35dip"
android:paddingRight="10dip"
android:enabled="false"/>
<View android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/tabs_tray_bg_repeat"
android:layout_marginRight="75dip"/>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginRight="13dip">
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1.0"
style="@style/TabRowTextAppearance"
android:gravity="center_vertical"
android:padding="10dip"
android:textSize="13sp"/>
<ImageButton android:id="@+id/remote_tabs"
android:layout_width="@dimen/browser_toolbar_height"
android:layout_height="@dimen/browser_toolbar_height"
android:gravity="center_vertical"
android:padding="10dip"
android:src="@drawable/remote_tabs_level"
android:contentDescription="@string/remote_tabs"
android:background="@drawable/action_bar_button"
android:visibility="gone"/>
<ImageButton android:id="@+id/add_tab"
android:layout_width="65dip"
android:layout_height="@dimen/browser_toolbar_height"
android:gravity="center_vertical"
android:paddingLeft="10dip"
android:paddingRight="35dip"
android:src="@drawable/tab_new"
android:contentDescription="@string/new_tab"
android:background="@drawable/tab_new_button"/>
</LinearLayout>
</RelativeLayout>
</merge>

5
mobile/android/base/resources/layout-sw600dp/tabs_panel_toolbar.xml
View File

@ -39,9 +39,4 @@
</LinearLayout>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:background="@drawable/tabs_tray_list_divider"/>
</merge>

146
mobile/android/base/resources/layout-v14/browser_toolbar.xml Normal file
View File

@ -0,0 +1,146 @@
<?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/. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/browser_toolbar"
style="@style/BrowserToolbar">
<RelativeLayout android:id="@+id/address_bar"
style="@style/AddressBar">
<ImageButton android:id="@+id/back"
android:contentDescription="@string/back"
style="@style/AddressBar.ImageButton.Unused"/>
<ImageButton android:id="@+id/forward"
android:contentDescription="@string/forward"
style="@style/AddressBar.ImageButton.Unused"/>
<LinearLayout android:id="@+id/menu_items"
android:layout_width="0dip"
android:layout_height="0dip"
android:visibility="gone"/>
<View android:id="@+id/spacer_menu"
style="@style/AddressBar.ImageButton"
android:layout_width="22dip"
android:layout_alignParentRight="true"/>
<View android:id="@+id/spacer_tabs"
style="@style/AddressBar.ImageButton"
android:layout_width="95dip"
android:layout_alignParentRight="true"/>
<View android:id="@+id/curve"
android:layout_width="56dip"
android:layout_height="fill_parent"
android:layout_marginRight="60dip"
android:layout_alignParentRight="true"
android:background="@drawable/address_bar_bg_curve"/>
<View android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/curve"
android:background="@drawable/address_bar_bg"/>
<ImageButton android:id="@+id/menu"
style="@style/AddressBar.ImageButton"
android:layout_width="78dip"
android:layout_alignParentRight="true"
android:gravity="center_vertical"
android:src="@drawable/menu_level"
android:contentDescription="@string/menu"
android:background="@drawable/menu_button"
android:paddingLeft="42dip"
android:paddingRight="12dip"
android:visibility="gone"/>
<ImageButton android:id="@+id/tabs"
style="@style/AddressBar.ImageButton"
android:layout_width="98dip"
android:layout_toLeftOf="@+id/spacer_menu"
android:background="@drawable/tabs_button"
android:gravity="center_vertical"
android:src="@drawable/tabs_level"
android:paddingLeft="38dip"
android:paddingRight="36dip"/>
<TextSwitcher android:id="@+id/tabs_count"
style="@style/AddressBar.ImageButton"
android:layout_width="98dip"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_alignRight="@id/tabs"
android:gravity="center_horizontal"/>
<Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
android:layout_width="fill_parent"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="6dp"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/spacer_tabs"
android:layout_centerVertical="true"
android:background="@drawable/address_bar_url"
android:singleLine="true"
android:gravity="center_vertical|left"
android:hint="@string/awesomebar_default_text"
android:textColor="#222222"
android:paddingLeft="41dip"
android:paddingRight="10dip"/>
<ImageButton android:id="@+id/favicon"
style="@style/AddressBar.ImageButton"
android:layout_width="21.33dip"
android:layout_height="21.33dip"
android:layout_marginLeft="10dip"
android:layout_centerVertical="true"
android:src="@drawable/favicon"
android:layout_alignLeft="@id/awesome_bar"/>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignRight="@id/awesome_bar"
android:orientation="horizontal">
<ImageButton android:id="@+id/reader"
style="@style/AddressBar.ImageButton.Icon"
android:padding="12dip"
android:src="@drawable/reader"
android:contentDescription="@string/reader_mode"
android:visibility="gone"/>
<ImageButton android:id="@+id/site_security"
style="@style/AddressBar.ImageButton.Icon"
android:padding="12dip"
android:src="@drawable/site_security_level"
android:contentDescription="@string/site_security"
android:visibility="gone"/>
<ImageButton android:id="@+id/stop"
style="@style/AddressBar.ImageButton.Icon"
android:padding="12dip"
android:src="@drawable/urlbar_stop"
android:contentDescription="@string/stop"
android:visibility="gone"/>
</LinearLayout>
<ImageView android:id="@+id/shadow"
android:layout_width="fill_parent"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:background="@drawable/address_bar_bg_shadow_repeat"
android:visibility="gone"/>
</RelativeLayout>
</LinearLayout>

65
mobile/android/base/resources/layout-v14/tabs_panel_toolbar.xml Normal file
View File

@ -0,0 +1,65 @@
<?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/. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ImageButton android:id="@+id/menu"
style="@style/AddressBar.ImageButton"
android:layout_width="78dip"
android:layout_alignParentRight="true"
android:gravity="center_vertical"
android:src="@drawable/menu"
android:contentDescription="@string/menu"
android:background="@drawable/menu_normal"
android:paddingLeft="42dip"
android:paddingRight="12dip"
android:enabled="false"/>
<View android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/tabs_tray_bg_repeat"
android:layout_marginRight="95dip"/>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginRight="19dip">
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1.0"
style="@style/TabRowTextAppearance"
android:gravity="center_vertical"
android:padding="10dip"
android:textSize="16sp"/>
<ImageButton android:id="@+id/remote_tabs"
android:layout_width="@dimen/browser_toolbar_height"
android:layout_height="@dimen/browser_toolbar_height"
android:gravity="center_vertical"
android:padding="12dip"
android:src="@drawable/remote_tabs_level"
android:contentDescription="@string/remote_tabs"
android:background="@drawable/action_bar_button"
android:visibility="gone"/>
<ImageButton android:id="@+id/add_tab"
android:layout_width="78dip"
android:layout_height="@dimen/browser_toolbar_height"
android:gravity="center_vertical"
android:paddingLeft="12dip"
android:paddingRight="42dip"
android:src="@drawable/tab_new"
android:contentDescription="@string/new_tab"
android:background="@drawable/tab_new_button"/>
</LinearLayout>
</RelativeLayout>
</merge>

5
mobile/android/base/resources/layout-xlarge/tabs_panel_toolbar.xml
View File

@ -39,9 +39,4 @@
</LinearLayout>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:background="@drawable/tabs_tray_list_divider"/>
</merge>

44
mobile/android/base/resources/layout/browser_toolbar.xml
View File

@ -8,8 +8,7 @@
style="@style/BrowserToolbar">
<RelativeLayout android:id="@+id/address_bar"
style="@style/AddressBar"
android:background="@drawable/address_bar_bg">
style="@style/AddressBar">
<ImageButton android:id="@+id/back"
android:contentDescription="@string/back"
@ -23,11 +22,28 @@
android:layout_width="0dip"
android:layout_height="0dip"
android:visibility="gone"/>
<ImageView android:id="@+id/spacer"
style="@style/AddressBar.ImageButton"
android:layout_width="50dip"
android:layout_alignParentRight="true"/>
<View android:id="@+id/spacer_tabs"
style="@style/AddressBar.ImageButton"
android:layout_width="48dip"
android:layout_alignParentRight="true"/>
<View android:id="@+id/curve"
android:layout_width="56dip"
android:layout_height="fill_parent"
android:layout_marginRight="10dip"
android:layout_alignParentRight="true"
android:background="@drawable/address_bar_bg_curve"/>
<View android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/curve"
android:background="@drawable/address_bar_bg"/>
<ImageButton android:id="@+id/menu"
style="@style/AddressBar.ImageButton.Unused"/>
<ImageButton android:id="@+id/tabs"
style="@style/AddressBar.ImageButton"
@ -46,18 +62,6 @@
android:layout_marginTop="5dp"
android:layout_alignRight="@id/tabs"
android:gravity="center_horizontal"/>
<ImageButton android:id="@+id/menu"
style="@style/AddressBar.ImageButton"
android:layout_width="@dimen/browser_toolbar_height"
android:layout_toLeftOf="@id/spacer"
android:gravity="center_vertical"
android:src="@drawable/menu"
android:contentDescription="@string/menu"
android:background="@drawable/action_bar_button"
android:paddingLeft="12dip"
android:paddingRight="12dip"
android:visibility="gone"/>
<Button android:id="@+id/awesome_bar"
style="@style/AddressBar.Button"
@ -68,7 +72,7 @@
android:layout_marginRight="4dp"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/menu"
android:layout_toLeftOf="@id/spacer_tabs"
android:layout_centerVertical="true"
android:background="@drawable/address_bar_url"
android:singleLine="true"

22
mobile/android/base/resources/layout/tabs_panel.xml
View File

@ -10,11 +10,21 @@
android:layout_width="fill_parent"
android:layout_height="@dimen/browser_toolbar_height"/>
<view class="org.mozilla.gecko.TabsPanel$TabsListContainer"
android:id="@+id/list_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:background="@drawable/tabs_tray_bg_repeat"/>
<RelativeLayout android:layout_width="fill_parent"
android:layout_height="fill_parent">
<view class="org.mozilla.gecko.TabsPanel$TabsListContainer"
android:id="@+id/list_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:background="@drawable/tabs_tray_bg_repeat"/>
<View android:layout_width="fill_parent"
android:layout_height="3dp"
android:layout_alignParentTop="true"
android:background="@drawable/tabs_shadow"/>
</RelativeLayout>
</merge>

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

@ -43,9 +43,4 @@
</LinearLayout>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:background="@drawable/tabs_tray_list_divider"/>
</merge>