Bug 739364: All iconified buttons in url-bar should have bigger target area. [r=mfinkle]
authorSriram Ramasubramanian <sriram@mozilla.com>
Mon, 02 Jul 2012 11:22:29 -0700
changeset 98123 28d34d5f50ae6bf14d39101da0eb7254c1cdf431
parent 98122 a92bb4e1842de83bb4b853734d5c707f2a0a4a86
child 98124 26aa29fdd8884160716b73638355b0bfdaf58452
child 98125 b1b127541ba8e17df37686f782e197b5075d3de8
push id23024
push userryanvm@gmail.com
push dateMon, 02 Jul 2012 22:29:23 +0000
treeherdermozilla-central@26aa29fdd888 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs739364
milestone16.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 739364: All iconified buttons in url-bar should have bigger target area. [r=mfinkle]
mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
mobile/android/base/resources/layout-sw600dp/awesomebar_search.xml
mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml
mobile/android/base/resources/layout-xlarge/awesomebar_search.xml
mobile/android/base/resources/layout-xlarge/browser_toolbar.xml
mobile/android/base/resources/layout/awesomebar_search.xml
mobile/android/base/resources/layout/browser_toolbar.xml
mobile/android/base/resources/values/styles.xml
--- a/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
@@ -84,41 +84,37 @@
                      android:layout_height="21.33dip"
                      android:layout_marginLeft="7dip"
                      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_marginRight="10dip"
                       android:layout_centerVertical="true"
                       android:layout_alignRight="@id/awesome_bar"
                       android:orientation="horizontal">
 
             <ImageButton android:id="@+id/reader"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         style="@style/AddressBar.ImageButton.Icon"
+                         android:padding="10dip"
                          android:src="@drawable/reader"
                          android:contentDescription="@string/reader_mode"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/site_security"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         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/stop"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         style="@style/AddressBar.ImageButton.Icon"
+                         android:padding="10dip"
                          android:src="@drawable/urlbar_stop"
                          android:contentDescription="@string/stop"
                          android:visibility="gone"/>
 
         </LinearLayout>
 
          <ImageView android:id="@+id/shadow"
                     android:layout_width="fill_parent"
--- a/mobile/android/base/resources/layout-sw600dp/awesomebar_search.xml
+++ b/mobile/android/base/resources/layout-sw600dp/awesomebar_search.xml
@@ -38,18 +38,16 @@
     </view>
 
     <LinearLayout android:layout_width="4dp"
                   android:layout_height="fill_parent"
                   android:orientation="vertical"
                   android:layout_alignParentRight="true"/>
 
     <ImageButton android:id="@+id/awesomebar_button"
-                 style="@style/AddressBar.ImageButton"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_marginRight="15dip"
+                 style="@style/AddressBar.ImageButton.Icon"
+                 android:padding="14dip"
                  android:layout_centerVertical="true"
                  android:layout_alignRight="@id/awesomebar_text"
                  android:visibility="gone"
                  android:src="@drawable/ic_awesomebar_go"/>
 
 </RelativeLayout>
--- a/mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml
@@ -94,41 +94,37 @@
                      android:layout_height="21.33dip"
                      android:layout_marginLeft="10dip"
                      android:layout_centerVertical="true"
                      android:src="@drawable/favicon"
                      android:layout_toRightOf="@id/forward"/>
 
         <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"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         style="@style/AddressBar.ImageButton.Icon"
+                         android:padding="14dip"
                          android:src="@drawable/reader"
                          android:contentDescription="@string/reader_mode"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/site_security"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         style="@style/AddressBar.ImageButton.Icon"
+                         android:padding="14dip"
                          android:src="@drawable/site_security_level"
                          android:contentDescription="@string/site_security"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/stop"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         style="@style/AddressBar.ImageButton.Icon"
+                         android:padding="14dip"
                          android:src="@drawable/urlbar_stop"
                          android:contentDescription="@string/stop"
                          android:visibility="gone"/>
 
         </LinearLayout>
 
          <ImageView android:id="@+id/shadow"
                     android:layout_width="fill_parent"
--- a/mobile/android/base/resources/layout-xlarge/awesomebar_search.xml
+++ b/mobile/android/base/resources/layout-xlarge/awesomebar_search.xml
@@ -38,18 +38,16 @@
     </view>
 
     <LinearLayout android:layout_width="4dp"
                   android:layout_height="fill_parent"
                   android:orientation="vertical"
                   android:layout_alignParentRight="true"/>
 
     <ImageButton android:id="@+id/awesomebar_button"
-                 style="@style/AddressBar.ImageButton"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_marginRight="15dip"
+                 style="@style/AddressBar.ImageButton.Icon"
+                 android:padding="14dip"
                  android:layout_centerVertical="true"
                  android:layout_alignRight="@id/awesomebar_text"
                  android:visibility="gone"
                  android:src="@drawable/ic_awesomebar_go"/>
 
 </RelativeLayout>
--- a/mobile/android/base/resources/layout-xlarge/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-xlarge/browser_toolbar.xml
@@ -94,41 +94,37 @@
                      android:layout_height="21.33dip"
                      android:layout_marginLeft="10dip"
                      android:layout_centerVertical="true"
                      android:src="@drawable/favicon"
                      android:layout_toRightOf="@id/forward"/>
 
         <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"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         style="@style/AddressBar.ImageButton.Icon"
+                         android:padding="14dip"
                          android:src="@drawable/reader"
                          android:contentDescription="@string/reader_mode"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/site_security"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         style="@style/AddressBar.ImageButton.Icon"
+                         android:padding="14dip"
                          android:src="@drawable/site_security_level"
                          android:contentDescription="@string/site_security"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/stop"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         style="@style/AddressBar.ImageButton.Icon"
+                         android:padding="14dip"
                          android:src="@drawable/urlbar_stop"
                          android:contentDescription="@string/stop"
                          android:visibility="gone"/>
 
         </LinearLayout>
 
          <ImageView android:id="@+id/shadow"
                     android:layout_width="fill_parent"
--- a/mobile/android/base/resources/layout/awesomebar_search.xml
+++ b/mobile/android/base/resources/layout/awesomebar_search.xml
@@ -27,18 +27,16 @@
     </view>
 
     <LinearLayout android:layout_width="4dp"
                   android:layout_height="fill_parent"
                   android:orientation="vertical"
                   android:layout_alignParentRight="true"/>
 
     <ImageButton android:id="@+id/awesomebar_button"
-                 style="@style/AddressBar.ImageButton"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_marginRight="15dip"
+                 style="@style/AddressBar.ImageButton.Icon"
+                 android:padding="12dip"
                  android:layout_centerVertical="true"
                  android:layout_alignRight="@id/awesomebar_text"
                  android:visibility="gone"
                  android:src="@drawable/ic_awesomebar_go"/>
 
 </RelativeLayout>
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -84,41 +84,37 @@
                      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_marginRight="10dip"
                       android:layout_centerVertical="true"
                       android:layout_alignRight="@id/awesome_bar"
                       android:orientation="horizontal">
 
             <ImageButton android:id="@+id/reader"
-                         style="@style/AddressBar.ImageButton"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         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"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         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"
-                         android:layout_width="24dip"
-                         android:layout_height="24dip"
+                         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"
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -60,16 +60,22 @@
 
     <!-- Address bar - Image Button - Unused -->
     <style name="AddressBar.ImageButton.Unused">
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_height">0dip</item>
         <item name="android:visibility">gone</item>
     </style>
 
+    <!-- Address bar - Image Button - Icon -->
+    <style name="AddressBar.ImageButton.Icon">
+         <item name="android:layout_width">@dimen/browser_toolbar_height</item>
+         <item name="android:layout_height">@dimen/browser_toolbar_height</item>
+    </style>
+
     <!-- AwesomeBar -->
     <style name="AwesomeBar">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">48dip</item>
         <item name="android:orientation">horizontal</item>
     </style>
 
     <!-- Lists in AwesomeBar -->