Bug 771380 - Reorganize toolbar layout to better handle dynamic icons (r=sriram)

* * *
fold me

mobile/android/base/BrowserToolbar.java

@@ -29,6 +29,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
@@ -46,6 +47,8 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
     private static final String LOGTAG = "GeckoToolbar";
     private LinearLayout mLayout;
     private Button mAwesomeBar;
+    private TextView mTitle;
+    private int mTitlePadding;
     private ImageButton mTabs;
     private ImageView mBack;
     private ImageView mForward;
@@ -64,7 +67,6 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
     final private BrowserApp mActivity;
     private LayoutInflater mInflater;
     private Handler mHandler;
-    private int[] mPadding;
     private boolean mHasSoftMenuButton;
 
     private boolean mShowSiteSecurity;
@@ -98,6 +100,9 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
         mShowSiteSecurity = false;
         mShowReader = false;
 
+        mTitle = (TextView) mLayout.findViewById(R.id.title);
+        mTitlePadding = mTitle.getPaddingRight();
+
         mAwesomeBar = (Button) mLayout.findViewById(R.id.awesome_bar);
         mAwesomeBar.setOnClickListener(new Button.OnClickListener() {
             public void onClick(View v) {
@@ -133,11 +138,6 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
             }
         });
 
-        mPadding = new int[] { mAwesomeBar.getPaddingLeft(),
-                               mAwesomeBar.getPaddingTop(),
-                               mAwesomeBar.getPaddingRight(),
-                               mAwesomeBar.getPaddingBottom() };
-
         mTabs = (ImageButton) mLayout.findViewById(R.id.tabs);
         mTabs.setOnClickListener(new Button.OnClickListener() {
             public void onClick(View v) {
@@ -166,21 +166,19 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
             }
         });
 
-        mFavicon = (ImageButton) mLayout.findViewById(R.id.favicon);
-        mSiteSecurity = (ImageButton) mLayout.findViewById(R.id.site_security);
-        mSiteSecurity.setOnClickListener(new Button.OnClickListener() {
+        Button.OnClickListener faviconListener = new Button.OnClickListener() {
             public void onClick(View view) {
-                int[] lockLocation = new int[2];
-                view.getLocationOnScreen(lockLocation);
+                if (mSiteSecurity.getVisibility() != View.VISIBLE)
+                    return;
 
-                RelativeLayout.LayoutParams iconsLayoutParams =
-                        (RelativeLayout.LayoutParams) ((View) view.getParent()).getLayoutParams();
-
-                // Calculate the left margin for the arrow based on the position of the lock icon.
-                int leftMargin = lockLocation[0] - iconsLayoutParams.rightMargin;
-                SiteIdentityPopup.getInstance().show(mSiteSecurity, leftMargin);
+                SiteIdentityPopup.getInstance().show(mSiteSecurity);
             }
-        });
+        };
+
+        mFavicon = (ImageButton) mLayout.findViewById(R.id.favicon);
+        mFavicon.setOnClickListener(faviconListener);
+        mSiteSecurity = (ImageButton) mLayout.findViewById(R.id.site_security);
+        mSiteSecurity.setOnClickListener(faviconListener);
 
         mProgressSpinner = (AnimationDrawable) mActivity.getResources().getDrawable(R.drawable.progress_spinner);
         
@@ -427,13 +425,10 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
         mSiteSecurity.setVisibility(mShowSiteSecurity && !isLoading ? View.VISIBLE : View.GONE);
         mReader.setVisibility(mShowReader && !isLoading ? View.VISIBLE : View.GONE);
 
-        if (!isLoading && !mShowSiteSecurity && !mShowReader) {
-            // No visible page actions
-            mAwesomeBar.setPadding(mPadding[0], mPadding[1], mPadding[2], mPadding[3]);
-        } else {
-            // At least one visible page action
-            mAwesomeBar.setPadding(mPadding[0], mPadding[1], mPadding[0], mPadding[3]);
-        }
+        // We want title to fill the whole space available for it when there are icons
+        // being shown on the right side of the toolbar as the icons already have some
+        // padding in them. This is just to avoid wasting space when icons are shown.
+        mTitle.setPadding(0, 0, (!mShowReader && !isLoading ? mTitlePadding : 0), 0);
 
         updateFocusOrder();
     }
@@ -471,7 +466,8 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
         if (tab != null && "about:home".equals(tab.getURL()))
             title = null;
 
-        mAwesomeBar.setText(title);
+        mTitle.setText(title);
+        mAwesomeBar.setContentDescription(title);
     }
 
     public void setFavicon(Drawable image) {

mobile/android/base/SiteIdentityPopup.java

@@ -78,7 +78,7 @@ public class SiteIdentityPopup extends PopupWindow {
         mInflated = true;
     }
 
-    public void show(View v, int leftMargin) {
+    public void show(View v) {
         Tab selectedTab = Tabs.getInstance().getSelectedTab();
         if (selectedTab == null) {
             Log.e(LOGTAG, "Selected tab is null");
@@ -146,13 +146,15 @@ public class SiteIdentityPopup extends PopupWindow {
             mSupplemental.setTextColor(mResources.getColor(R.color.identity_identified));
         }
 
+        int[] anchorLocation = new int[2];
+        v.getLocationOnScreen(anchorLocation);
+
+        int arrowWidth = mResources.getDimensionPixelSize(R.dimen.doorhanger_arrow_width);
+        int leftMargin = anchorLocation[0] + (v.getWidth() - arrowWidth) / 2;
+
         int offset = 0;
         if (GeckoApp.mAppContext.isTablet()) {
             int popupWidth = mResources.getDimensionPixelSize(R.dimen.site_identity_popup_width);
-            int arrowWidth = mResources.getDimensionPixelSize(R.dimen.doorhanger_arrow_width);
-
-            // Double arrowWidth to leave extra space on the right side of the arrow
-            leftMargin = popupWidth - arrowWidth*2;
             offset = 0 - popupWidth + arrowWidth*3/2 + v.getWidth()/2;
         }
 

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

@@ -56,62 +56,71 @@
                      android:layout_marginTop="4.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="3dp"
-                android:layout_marginBottom="3dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="45dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                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="35dip"
-                android:paddingRight="7dip"/>
 
-        <ImageButton android:id="@+id/favicon"
-                     style="@style/AddressBar.ImageButton"
-                     android:layout_width="21.33dip"
-                     android:layout_height="21.33dip"
-                     android:layout_marginLeft="7dip"
-                     android:layout_centerVertical="true"
-                     android:src="@drawable/favicon"
-                     android:layout_alignLeft="@id/awesome_bar"/>
+        <FrameLayout style="@style/AddressBar.Button"
+                     android:layout_marginTop="3dp"
+                     android:layout_marginBottom="3dp"
+                     android:layout_marginLeft="4dp"
+                     android:layout_marginRight="45dp"
+                     android:layout_alignParentLeft="true"
+                     android:layout_alignParentBottom="true"
+                     android:layout_centerVertical="true">
 
-        <LinearLayout android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_centerVertical="true"
-                      android:layout_alignRight="@id/awesome_bar"
-                      android:orientation="horizontal">
+            <Button android:id="@+id/awesome_bar"
+                    style="@style/AddressBar.Button"
+                    android:background="@drawable/address_bar_url"/>
 
-            <ImageButton android:id="@+id/reader"
-                         style="@style/AddressBar.ImageButton.Icon"
-                         android:padding="10dip"
-                         android:src="@drawable/reader"
-                         android:contentDescription="@string/reader_mode"
-                         android:visibility="gone"/>
+            <LinearLayout style="@style/AddressBar.Button"
+                          android:orientation="horizontal">
 
-            <ImageButton android:id="@+id/site_security"
-                         style="@style/AddressBar.ImageButton.Icon"
-                         android:padding="10dip"
-                         android:src="@drawable/site_security_level"
-                         android:contentDescription="@string/site_security"
-                         android:visibility="gone"/>
+                <ImageButton android:id="@+id/favicon"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="29.33dip"
+                             android:layout_height="fill_parent"
+                             android:scaleType="fitCenter"
+                             android:paddingLeft="8dip"
+                             android:layout_marginRight="4dip"
+                             android:layout_gravity="center_vertical"
+                             android:src="@drawable/favicon"/>
 
-            <ImageButton android:id="@+id/stop"
-                         style="@style/AddressBar.ImageButton.Icon"
-                         android:padding="10dip"
-                         android:src="@drawable/urlbar_stop"
-                         android:contentDescription="@string/stop"
-                         android:visibility="gone"/>
+                <ImageButton android:id="@+id/site_security"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="21.33dip"
+                             android:scaleType="fitCenter"
+                             android:layout_marginLeft="-4dip"
+                             android:paddingLeft="1dp"
+                             android:paddingRight="1dp"
+                             android:src="@drawable/site_security_level"
+                             android:contentDescription="@string/site_security"
+                             android:visibility="gone"/>
 
-        </LinearLayout>
+                <TextView android:id="@+id/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"/>
+
+                <ImageButton android:id="@+id/reader"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/reader"
+                             android:contentDescription="@string/reader_mode"
+                             android:visibility="gone"/>
+
+                <ImageButton android:id="@+id/stop"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/urlbar_stop"
+                             android:contentDescription="@string/stop"
+                             android:visibility="gone"/>
+
+            </LinearLayout>
+
+        </FrameLayout>
 
          <ImageView android:id="@+id/shadow"
                     android:layout_width="fill_parent"

mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml

@@ -67,61 +67,70 @@
                      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="3dp"
-                android:layout_marginBottom="3dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="80dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                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="35dip"
-                android:paddingRight="7dip"/>
+        <FrameLayout style="@style/AddressBar.Button"
+                     android:layout_marginTop="3dp"
+                     android:layout_marginBottom="3dp"
+                     android:layout_marginLeft="4dp"
+                     android:layout_marginRight="80dp"
+                     android:layout_alignParentLeft="true"
+                     android:layout_alignParentBottom="true"
+                     android:layout_centerVertical="true">
 
-        <ImageButton android:id="@+id/favicon"
-                     style="@style/AddressBar.ImageButton"
-                     android:layout_width="21.33dip"
-                     android:layout_height="21.33dip"
-                     android:layout_marginLeft="7dip"
-                     android:layout_centerVertical="true"
-                     android:src="@drawable/favicon"
-                     android:layout_alignLeft="@id/awesome_bar"/>
+            <Button android:id="@+id/awesome_bar"
+                    style="@style/AddressBar.Button"
+                    android:background="@drawable/address_bar_url"/>
 
-        <LinearLayout android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_centerVertical="true"
-                      android:layout_alignRight="@id/awesome_bar"
-                      android:orientation="horizontal">
+            <LinearLayout style="@style/AddressBar.Button"
+                          android:orientation="horizontal">
 
-            <ImageButton android:id="@+id/reader"
-                         style="@style/AddressBar.ImageButton.Icon"
-                         android:padding="10dip"
-                         android:src="@drawable/reader"
-                         android:contentDescription="@string/reader_mode"
-                         android:visibility="gone"/>
+                <ImageButton android:id="@+id/favicon"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="29.33dip"
+                             android:layout_height="fill_parent"
+                             android:scaleType="fitCenter"
+                             android:paddingLeft="8dip"
+                             android:layout_marginRight="4dip"
+                             android:layout_gravity="center_vertical"
+                             android:src="@drawable/favicon"/>
 
-            <ImageButton android:id="@+id/site_security"
-                         style="@style/AddressBar.ImageButton.Icon"
-                         android:padding="10dip"
-                         android:src="@drawable/site_security_level"
-                         android:contentDescription="@string/site_security"
-                         android:visibility="gone"/>
+                <ImageButton android:id="@+id/site_security"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="21.33dip"
+                             android:scaleType="fitCenter"
+                             android:layout_marginLeft="-4dip"
+                             android:paddingLeft="1dp"
+                             android:paddingRight="1dp"
+                             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="10dip"
-                         android:src="@drawable/urlbar_stop"
-                         android:contentDescription="@string/stop"
-                         android:visibility="gone"/>
+                <TextView android:id="@+id/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"/>
 
-        </LinearLayout>
+                <ImageButton android:id="@+id/reader"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/reader"
+                             android:contentDescription="@string/reader_mode"
+                             android:visibility="gone"/>
+
+                <ImageButton android:id="@+id/stop"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/urlbar_stop"
+                             android:contentDescription="@string/stop"
+                             android:visibility="gone"/>
+
+            </LinearLayout>
+
+        </FrameLayout>
 
          <ImageView android:id="@+id/shadow"
                     android:layout_width="fill_parent"

mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml

@@ -61,89 +61,95 @@
                       android:orientation="horizontal"
                       android:layout_marginRight="110dip"
                       android:layout_alignParentRight="true"/>
-        
-        <Button android:id="@+id/awesome_bar"
-                style="@style/AddressBar.Button"
-                android:layout_width="fill_parent"
-                android:layout_marginLeft="26dp"
-                android:layout_marginTop="6dp"
-                android:layout_marginBottom="6dp"
-                android:layout_marginRight="0dp"
-                android:layout_toLeftOf="@id/menu_items"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                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="105dip"
-                android:paddingRight="10dip"/>
 
-        <ImageButton android:id="@+id/forward"
-                     style="@style/AddressBar.ImageButton"
-                     android:layout_width="64dip"
-                     android:layout_height="40dip"
-                     android:layout_centerVertical="true"
-                     android:layout_alignLeft="@id/awesome_bar"
-                     android:paddingLeft="26dp"
-                     android:src="@drawable/ic_menu_forward"
-                     android:contentDescription="@string/forward"
-                     android:background="@drawable/address_bar_forward_button"/>
-
-        <ImageButton android:id="@+id/back"
-                     style="@style/AddressBar.ImageButton"
-                     android:layout_width="50dip"
-                     android:layout_height="50dip"
-                     android:layout_marginLeft="6dp"
-                     android:layout_centerVertical="true"
+        <FrameLayout style="@style/AddressBar.Button"
+                     android:layout_toLeftOf="@id/menu_items"
                      android:layout_alignParentLeft="true"
-                     android:src="@drawable/ic_menu_back"
-                     android:contentDescription="@string/back"
-                     android:background="@drawable/address_bar_back_button"/>
+                     android:layout_alignParentBottom="true"
+                     android:layout_centerVertical="true">
 
-        <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_toRightOf="@id/forward"/>
+            <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"/>
 
-        <LinearLayout android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginRight="10dip"
-                      android:layout_centerVertical="true"
-                      android:layout_alignRight="@id/awesome_bar"
-                      android:orientation="horizontal">
-
-            <ImageButton android:id="@+id/reader"
+            <ImageButton android:id="@+id/forward"
                          style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
-                         android:src="@drawable/reader"
-                         android:contentDescription="@string/reader_mode"
-                         android:visibility="gone"/>
+                         android:layout_width="64dip"
+                         android:layout_height="40dip"
+                         android:layout_marginLeft="26dp"
+                         android:paddingLeft="26dp"
+                         android:layout_gravity="center_vertical"
+                         android:src="@drawable/ic_menu_forward"
+                         android:contentDescription="@string/forward"
+                         android:background="@drawable/address_bar_forward_button"/>
 
-            <ImageButton android:id="@+id/site_security"
+            <ImageButton android:id="@+id/back"
                          style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
-                         android:src="@drawable/site_security_level"
-                         android:contentDescription="@string/site_security"
-                         android:visibility="gone"/>
+                         android:layout_width="50dip"
+                         android:layout_height="50dip"
+                         android:layout_marginLeft="6dp"
+                         android:layout_gravity="center_vertical"
+                         android:src="@drawable/ic_menu_back"
+                         android:contentDescription="@string/back"
+                         android:background="@drawable/address_bar_back_button"/>
 
-            <ImageButton android:id="@+id/stop"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
-                         android:src="@drawable/urlbar_stop"
-                         android:contentDescription="@string/stop"
-                         android:visibility="gone"/>
+            <LinearLayout style="@style/AddressBar.Button"
+                          android:layout_marginLeft="90dp"
+                          android:layout_marginTop="6dp"
+                          android:layout_marginBottom="6dp"
+                          android:layout_marginRight="0dp"
+                          android:orientation="horizontal">
 
-        </LinearLayout>
+                <ImageButton android:id="@+id/favicon"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="29.33dip"
+                             android:layout_height="fill_parent"
+                             android:scaleType="fitCenter"
+                             android:paddingLeft="8dip"
+                             android:layout_marginRight="4dip"
+                             android:layout_gravity="center_vertical"
+                             android:src="@drawable/favicon"/>
+
+                <ImageButton android:id="@+id/site_security"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="21.33dip"
+                             android:scaleType="fitCenter"
+                             android:layout_marginLeft="-4dip"
+                             android:src="@drawable/site_security_level"
+                             android:contentDescription="@string/site_security"
+                             android:visibility="gone"/>
+
+                <TextView android:id="@+id/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"/>
+
+                <ImageButton android:id="@+id/reader"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/reader"
+                             android:contentDescription="@string/reader_mode"
+                             android:visibility="gone"/>
+
+                <ImageButton android:id="@+id/stop"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/urlbar_stop"
+                             android:contentDescription="@string/stop"
+                             android:visibility="gone"/>
+
+            </LinearLayout>
+
+        </FrameLayout>
 
          <ImageView android:id="@+id/shadow"
                     android:layout_width="fill_parent"

mobile/android/base/resources/layout-large-v11/site_identity_popup.xml

@@ -9,7 +9,7 @@
 
     <RelativeLayout android:layout_width="@dimen/site_identity_popup_width"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="24dip"
+                    android:layout_marginTop="15dip"
                     android:layout_alignParentTop="true"
                     android:background="@drawable/doorhanger_popup_bg">
 
@@ -77,7 +77,6 @@
     <ImageView android:id="@+id/arrow"
                android:layout_width="@dimen/doorhanger_arrow_width"
                android:layout_height="16dip"
-               android:layout_marginTop="9dip"
                android:layout_alignParentTop="true"
                android:src="@drawable/doorhanger_arrow"
                android:scaleType="fitXY"/>

mobile/android/base/resources/layout-xlarge-v11/browser_toolbar_menu.xml

@@ -46,89 +46,95 @@
                       android:layout_height="fill_parent"
                       android:orientation="horizontal"
                       android:layout_toLeftOf="@id/menu"/>
-        
-        <Button android:id="@+id/awesome_bar"
-                style="@style/AddressBar.Button"
-                android:layout_width="fill_parent"
-                android:layout_marginLeft="0dp"
-                android:layout_marginTop="6dp"
-                android:layout_marginBottom="6dp"
-                android:layout_marginRight="6dp"
-                android:layout_toRightOf="@id/tabs"
-                android:layout_toLeftOf="@id/menu_items"
-                android:layout_alignParentBottom="true"
-                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="105dip"
-                android:paddingRight="10dip"/>
 
-        <ImageButton android:id="@+id/forward"
-                     style="@style/AddressBar.ImageButton"
-                     android:layout_width="64dip"
-                     android:layout_height="40dip"
-                     android:layout_centerVertical="true"
-                     android:layout_alignLeft="@id/awesome_bar"
-                     android:paddingLeft="22dp"
-                     android:src="@drawable/ic_menu_forward"
-                     android:contentDescription="@string/forward"
-                     android:background="@drawable/address_bar_forward_button"/>
-
-        <ImageButton android:id="@+id/back"
-                     style="@style/AddressBar.ImageButton"
-                     android:layout_width="50dip"
-                     android:layout_height="50dip"
-                     android:layout_centerVertical="true"
+        <FrameLayout style="@style/AddressBar.Button"
+                     android:layout_toRightOf="@id/tabs"
+                     android:layout_toLeftOf="@id/menu_items"
                      android:layout_marginLeft="-28dp"
-                     android:layout_alignLeft="@id/awesome_bar"
-                     android:src="@drawable/ic_menu_back"
-                     android:contentDescription="@string/back"
-                     android:background="@drawable/address_bar_back_button"/>
+                     android:layout_alignParentBottom="true"
+                     android:layout_centerVertical="true">
 
-        <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_toRightOf="@id/forward"/>
+            <Button android:id="@+id/awesome_bar"
+                    style="@style/AddressBar.Button"
+                    android:layout_marginLeft="26dp"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="6dp"
+                    android:layout_marginRight="0dp"
+                    android:background="@drawable/address_bar_url"/>
 
-        <LinearLayout android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginRight="10dip"
-                      android:layout_centerVertical="true"
-                      android:layout_alignRight="@id/awesome_bar"
-                      android:orientation="horizontal">
-
-            <ImageButton android:id="@+id/reader"
+            <ImageButton android:id="@+id/forward"
                          style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
-                         android:src="@drawable/reader"
-                         android:contentDescription="@string/reader_mode"
-                         android:visibility="gone"/>
+                         android:layout_width="64dip"
+                         android:layout_height="40dip"
+                         android:layout_marginLeft="22dp"
+                         android:paddingLeft="22dp"
+                         android:layout_gravity="center_vertical"
+                         android:src="@drawable/ic_menu_forward"
+                         android:contentDescription="@string/forward"
+                         android:background="@drawable/address_bar_forward_button"/>
 
-            <ImageButton android:id="@+id/site_security"
+            <ImageButton android:id="@+id/back"
                          style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
-                         android:src="@drawable/site_security_level"
-                         android:contentDescription="@string/site_security"
-                         android:visibility="gone"/>
+                         android:layout_width="50dip"
+                         android:layout_height="50dip"
+                         android:layout_gravity="center_vertical"
+                         android:src="@drawable/ic_menu_back"
+                         android:contentDescription="@string/back"
+                         android:background="@drawable/address_bar_back_button"/>
 
-            <ImageButton android:id="@+id/stop"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
-                         android:src="@drawable/urlbar_stop"
-                         android:contentDescription="@string/stop"
-                         android:visibility="gone"/>
+            <LinearLayout style="@style/AddressBar.Button"
+                          android:layout_marginLeft="84dp"
+                          android:layout_marginTop="6dp"
+                          android:layout_marginBottom="6dp"
+                          android:layout_marginRight="0dp"
+                          android:orientation="horizontal">
 
-        </LinearLayout>
+                <ImageButton android:id="@+id/favicon"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="29.33dip"
+                             android:layout_height="fill_parent"
+                             android:scaleType="fitCenter"
+                             android:paddingLeft="8dip"
+                             android:layout_marginRight="4dip"
+                             android:layout_gravity="center_vertical"
+                             android:src="@drawable/favicon"/>
+
+                <ImageButton android:id="@+id/site_security"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="21.33dip"
+                             android:scaleType="fitCenter"
+                             android:layout_marginLeft="-4dip"
+                             android:src="@drawable/site_security_level"
+                             android:contentDescription="@string/site_security"
+                             android:visibility="gone"/>
+
+                <TextView android:id="@+id/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"/>
+
+                <ImageButton android:id="@+id/reader"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/reader"
+                             android:contentDescription="@string/reader_mode"
+                             android:visibility="gone"/>
+
+                <ImageButton android:id="@+id/stop"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/urlbar_stop"
+                             android:contentDescription="@string/stop"
+                             android:visibility="gone"/>
+
+            </LinearLayout>
+
+        </FrameLayout>
 
          <ImageView android:id="@+id/shadow"
                     android:layout_width="fill_parent"

mobile/android/base/resources/layout/browser_toolbar.xml

@@ -56,62 +56,69 @@
                      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="52dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                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"/>
+        <FrameLayout style="@style/AddressBar.Button"
+                     android:layout_marginTop="4dp"
+                     android:layout_marginBottom="4dp"
+                     android:layout_marginLeft="4dp"
+                     android:layout_marginRight="52dp"
+                     android:layout_alignParentLeft="true"
+                     android:layout_alignParentBottom="true"
+                     android:layout_centerVertical="true">
 
-        <LinearLayout android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_centerVertical="true"
-                      android:layout_alignRight="@id/awesome_bar"
-                      android:orientation="horizontal">
+            <Button android:id="@+id/awesome_bar"
+                    style="@style/AddressBar.Button"
+                    android:background="@drawable/address_bar_url"/>
 
-            <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"/>
+            <LinearLayout style="@style/AddressBar.Button"
+                          android:orientation="horizontal">
 
-            <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/favicon"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="29.33dip"
+                             android:layout_height="fill_parent"
+                             android:scaleType="fitCenter"
+                             android:paddingLeft="8dip"
+                             android:layout_marginRight="4dip"
+                             android:layout_gravity="center_vertical"
+                             android:src="@drawable/favicon"/>
 
-            <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"/>
+                <ImageButton android:id="@+id/site_security"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="21.33dip"
+                             android:scaleType="fitCenter"
+                             android:layout_marginLeft="-4dip"
+                             android:src="@drawable/site_security_level"
+                             android:contentDescription="@string/site_security"
+                             android:visibility="gone"/>
 
-        </LinearLayout>
+                <TextView android:id="@+id/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"/>
+
+                <ImageButton android:id="@+id/reader"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/reader"
+                             android:contentDescription="@string/reader_mode"
+                             android:visibility="gone"/>
+
+                <ImageButton android:id="@+id/stop"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/urlbar_stop"
+                             android:contentDescription="@string/stop"
+                             android:visibility="gone"/>
+
+            </LinearLayout>
+
+        </FrameLayout>
 
          <ImageView android:id="@+id/shadow"
                     android:layout_width="fill_parent"

mobile/android/base/resources/layout/browser_toolbar_menu.xml

@@ -67,62 +67,69 @@
                      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="100dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                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"/>
+        <FrameLayout style="@style/AddressBar.Button"
+                     android:layout_marginTop="4dp"
+                     android:layout_marginBottom="4dp"
+                     android:layout_marginLeft="4dp"
+                     android:layout_marginRight="100dp"
+                     android:layout_alignParentLeft="true"
+                     android:layout_alignParentBottom="true"
+                     android:layout_centerVertical="true">
 
-        <LinearLayout android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_centerVertical="true"
-                      android:layout_alignRight="@id/awesome_bar"
-                      android:orientation="horizontal">
+            <Button android:id="@+id/awesome_bar"
+                    style="@style/AddressBar.Button"
+                    android:background="@drawable/address_bar_url"/>
 
-            <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"/>
+            <LinearLayout style="@style/AddressBar.Button"
+                          android:orientation="horizontal">
 
-            <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/favicon"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="29.33dip"
+                             android:layout_height="fill_parent"
+                             android:scaleType="fitCenter"
+                             android:paddingLeft="8dip"
+                             android:layout_marginRight="4dip"
+                             android:layout_gravity="center_vertical"
+                             android:src="@drawable/favicon"/>
 
-            <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"/>
+                <ImageButton android:id="@+id/site_security"
+                             style="@style/AddressBar.ImageButton"
+                             android:layout_width="21.33dip"
+                             android:scaleType="fitCenter"
+                             android:layout_marginLeft="-4dip"
+                             android:src="@drawable/site_security_level"
+                             android:contentDescription="@string/site_security"
+                             android:visibility="gone"/>
 
-        </LinearLayout>
+                <TextView android:id="@+id/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"/>
+
+                <ImageButton android:id="@+id/reader"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/reader"
+                             android:contentDescription="@string/reader_mode"
+                             android:visibility="gone"/>
+
+                <ImageButton android:id="@+id/stop"
+                             style="@style/AddressBar.ImageButton.Icon"
+                             android:src="@drawable/urlbar_stop"
+                             android:contentDescription="@string/stop"
+                             android:visibility="gone"/>
+
+            </LinearLayout>
+
+        </FrameLayout>
 
          <ImageView android:id="@+id/shadow"
                     android:layout_width="fill_parent"

mobile/android/base/resources/layout/site_identity_popup.xml

@@ -9,7 +9,7 @@
 
     <RelativeLayout android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="24dip"
+                    android:layout_marginTop="15dip"
                     android:layout_alignParentTop="true"
                     android:background="@drawable/doorhanger_popup_bg">
 
@@ -77,7 +77,6 @@
     <ImageView android:id="@+id/arrow"
                android:layout_width="@dimen/doorhanger_arrow_width"
                android:layout_height="16dip"
-               android:layout_marginTop="9dip"
                android:layout_alignParentTop="true"
                android:src="@drawable/doorhanger_arrow"
                android:scaleType="fitXY"/>

mobile/android/base/resources/values-land-v14/dimens.xml

@@ -6,6 +6,7 @@
 <resources>
 
     <dimen name="browser_toolbar_height">40dp</dimen>
+    <dimen name="browser_toolbar_icon_width">46dp</dimen>
     <dimen name="tabs_counter_size">18sp</dimen>
 
 </resources>

mobile/android/base/resources/values-large-v11/dimens.xml

@@ -6,6 +6,7 @@
 <resources>
 
     <dimen name="browser_toolbar_height">56dp</dimen>
+    <dimen name="browser_toolbar_icon_width">45dp</dimen>
     <dimen name="tabs_counter_size">26sp</dimen>
 
 </resources>

mobile/android/base/resources/values/dimens.xml

@@ -15,6 +15,7 @@
     <dimen name="awesomebar_row_height">48dp</dimen>
     <dimen name="awesomebar_tab_transparency_height">38dp</dimen>
     <dimen name="browser_toolbar_height">48dp</dimen>
+    <dimen name="browser_toolbar_icon_width">36dp</dimen>
     <dimen name="doorhanger_arrow_width">44dp</dimen>
     <dimen name="flow_layout_spacing">6dp</dimen>
     <dimen name="local_tab_row_height">108dp</dimen>

mobile/android/base/resources/values/styles.xml

@@ -54,7 +54,8 @@
 
     <!-- Address bar - Image Button -->
     <style name="AddressBar.ImageButton" parent="AddressBar.Button">
-        <item name="android:scaleType">fitCenter</item>
+        <item name="android:scaleType">center</item>
+        <item name="android:layout_gravity">center_vertical</item>
         <item name="android:background">@android:color/transparent</item>
     </style>
 
@@ -67,8 +68,9 @@
 
     <!-- Address bar - Image Button - Icon -->
     <style name="AddressBar.ImageButton.Icon">
-         <item name="android:layout_width">@dimen/browser_toolbar_height</item>
+         <item name="android:layout_width">@dimen/browser_toolbar_icon_width</item>
          <item name="android:layout_height">@dimen/browser_toolbar_height</item>
+         <item name="android:layout_weight">0.0</item>
     </style>
 
     <!-- AwesomeBar -->