Bug 1010740 - Change appearance of input entry in toolbar (r=mcomella)

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

@@ -39,8 +39,8 @@
                android:layout_toRightOf="@id/tabs"
                android:layout_toLeftOf="@id/menu_items"
                android:layout_marginLeft="-18dp"
-               android:layout_marginTop="7dp"
-               android:layout_marginBottom="7dp"
+               android:layout_marginTop="8dp"
+               android:layout_marginBottom="8dp"
                android:duplicateParentState="true"
                android:clickable="false"
                android:focusable="false"
@@ -74,7 +74,9 @@
     <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_layout"
                   style="@style/UrlBar.Button.Container"
                   android:layout_toRightOf="@id/back"
-                  android:layout_toLeftOf="@id/menu_items"/>
+                  android:layout_toLeftOf="@id/menu_items"
+                  android:paddingLeft="8dip"
+                  android:paddingRight="8dip"/>
 
     <LinearLayout android:id="@+id/menu_items"
                   android:layout_width="wrap_content"

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

@@ -21,11 +21,10 @@
          changed dynamically. -->
     <ImageView android:id="@+id/url_bar_entry"
                style="@style/UrlBar.Button"
-               android:layout_marginLeft="4dp"
-               android:layout_marginRight="-15dp"
-               android:layout_marginTop="5dp"
-               android:layout_marginBottom="5dp"
-               android:layout_centerVertical="true"
+               android:layout_marginLeft="8dp"
+               android:layout_marginRight="-6dp"
+               android:layout_marginTop="8dp"
+               android:layout_marginBottom="8dp"
                android:layout_toLeftOf="@+id/tabs"
                android:duplicateParentState="true"
                android:clickable="false"
@@ -42,7 +41,7 @@
                android:layout_toLeftOf="@+id/tabs"
                android:layout_alignTop="@id/url_bar_entry"
                android:layout_alignBottom="@id/url_bar_entry"
-               android:layout_marginRight="-15dp"
+               android:layout_marginRight="-8dp"
                android:duplicateParentState="true"
                android:clickable="false"
                android:focusable="false"
@@ -71,14 +70,11 @@
 
     <org.mozilla.gecko.toolbar.ShapedButton android:id="@+id/tabs"
                                             style="@style/UrlBar.ImageButton"
-                                            android:layout_width="72dip"
+                                            android:layout_width="64dip"
                                             android:layout_toLeftOf="@id/menu"
                                             android:layout_alignWithParentIfMissing="true"
                                             gecko:curveTowards="right"
-                                            android:background="@drawable/shaped_button"
-                                            android:gravity="center_vertical"
-                                            android:paddingLeft="37dip"
-                                            android:paddingRight="11dip"/>
+                                            android:background="@drawable/shaped_button"/>
 
     <!-- The TextSwitcher should be shifted 24dp on the left, to avoid
          the curve. On a 48dp space, centering 24dp image will leave
@@ -90,9 +86,8 @@
                         style="@style/UrlBar.ImageButton.TabCount"
                         android:layout_width="24dip"
                         android:layout_height="24dip"
-                        android:layout_marginLeft="40dip"
+                        android:layout_centerVertical="true"
                         android:layout_marginRight="8dip"
-                        android:layout_marginTop="12dip"
                         android:layout_alignRight="@id/tabs"/>
 
     <!-- Note that the edit components are invisible so that the views
@@ -102,8 +97,6 @@
             style="@style/UrlBar.ImageButton.Icon"
             android:layout_alignParentRight="true"
             android:src="@drawable/close_edit_mode_selector"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
             android:contentDescription="@string/edit_mode_cancel"
             android:visibility="invisible"/>
 
@@ -112,15 +105,18 @@
          some padding from the right (value determined through experimentation). -->
     <org.mozilla.gecko.toolbar.ToolbarEditLayout android:id="@+id/edit_layout"
                   style="@style/UrlBar.Button"
+                  android:layout_alignLeft="@id/url_bar_entry"
                   android:layout_toLeftOf="@id/edit_cancel"
-                  android:paddingLeft="12dp"
-                  android:paddingRight="6dp"
-                  android:visibility="invisible"/>
+                  android:visibility="invisible"
+                  android:paddingLeft="8dp"
+                  android:paddingRight="8dp"/>
 
     <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_layout"
                   style="@style/UrlBar.Button"
-                  android:layout_toLeftOf="@id/tabs"
-                  android:layout_marginRight="-24dp"/>
+                  android:layout_alignLeft="@id/url_bar_entry"
+                  android:layout_alignRight="@id/url_bar_entry"
+                  android:paddingLeft="4dip"
+                  android:paddingRight="4dip"/>
 
     <ImageView android:id="@+id/shadow"
                android:layout_width="match_parent"

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

@@ -11,7 +11,6 @@
                  android:layout_width="@dimen/browser_toolbar_favicon_size"
                  android:layout_height="match_parent"
                  android:scaleType="fitCenter"
-                 android:layout_marginLeft="8dip"
                  android:paddingLeft="4dip"
                  android:paddingRight="4dip"
                  android:layout_gravity="center_vertical"/>
@@ -30,20 +29,20 @@
                                              android:layout_width="match_parent"
                                              android:layout_height="match_parent"
                                              android:layout_weight="1.0"
-                                             android:paddingRight="8dp"
                                              gecko:autoUpdateTheme="false"/>
 
     <org.mozilla.gecko.toolbar.PageActionLayout android:id="@+id/page_action_layout"
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="match_parent"
-                                                android:layout_marginRight="@dimen/browser_toolbar_button_padding"
                                                 android:visibility="gone"
                                                 android:orientation="horizontal"/>
 
     <ImageButton android:id="@+id/stop"
-                 style="@style/UrlBar.ImageButton.Icon"
+                 android:layout_width="@dimen/page_action_button_width"
+                 android:layout_height="match_parent"
                  android:src="@drawable/urlbar_stop"
                  android:contentDescription="@string/stop"
+                 android:background="#00ffffff"
                  android:visibility="gone"/>
 
 </merge>

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

@@ -8,7 +8,7 @@
     <style name="UrlBar.ImageButton.Forward">
         <item name="android:contentDescription">@string/forward</item>
         <item name="android:layout_width">45dip</item>
-        <item name="android:layout_height">38dip</item>
+        <item name="android:layout_height">36dip</item>
         <item name="android:paddingLeft">10dp</item>
         <item name="android:paddingTop">7dp</item>
         <item name="android:paddingBottom">7dp</item>

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

@@ -5,7 +5,7 @@
 
 <resources>
   <color name="background_light">#FFECF0F3</color>
-  <color name="background_normal">#FFCED7DE</color>
+  <color name="background_normal">#FFEBEBF0</color>
   <color name="background_private">#FF292C29</color>
   <color name="background_tabs">#FF363B40</color>
   <color name="highlight">#33000000</color>