Bug 1315717 - Pre: rearrange higlights padding to increase area for menu button r?sebastian draft
authorAndrzej Hunt <ahunt@mozilla.com>
Tue, 08 Nov 2016 10:09:08 -0500
changeset 437520 6a8cb91d7cee112d0f5267ed54cce1e85fda42d1
parent 437519 4665f705b4317824252e7c7876c4cab427beabaf
child 437521 87bb1b5bfddaac03d884b17e8d99878a881c4568
push id35432
push userahunt@mozilla.com
push dateFri, 11 Nov 2016 01:23:08 +0000
reviewerssebastian
bugs1315717
milestone52.0a1
Bug 1315717 - Pre: rearrange higlights padding to increase area for menu button r?sebastian The ripple added using selectableItemBackgroundBorderless is scaled to the actual View area. By rearranging our margins+padding we are able to make the empty space around the menu button part of its padding, which results in a more naturally sized ripple. Without this patch the circular ripple is tiny and looks odd. MozReview-Commit-ID: 3jHWiubMtDD
mobile/android/base/resources/layout/activity_stream_card_history_item.xml
--- a/mobile/android/base/resources/layout/activity_stream_card_history_item.xml
+++ b/mobile/android/base/resources/layout/activity_stream_card_history_item.xml
@@ -12,54 +12,57 @@
     android:layout_marginLeft="@dimen/activity_stream_base_margin"
     android:layout_marginRight="@dimen/activity_stream_base_margin"
     android:layout_marginStart="@dimen/activity_stream_base_margin"
     android:layout_marginTop="0dp"
     android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="10dp"
         android:background="?android:attr/selectableItemBackground">
 
         <org.mozilla.gecko.widget.FaviconView
             android:id="@+id/icon"
             android:layout_width="@dimen/favicon_bg"
             android:layout_height="@dimen/favicon_bg"
+            android:layout_marginLeft="@dimen/activity_stream_base_margin"
+            android:layout_marginStart="@dimen/activity_stream_base_margin"
+            android:layout_marginTop="@dimen/activity_stream_base_margin"
+            android:layout_marginBottom="@dimen/activity_stream_base_margin"
             android:layout_gravity="center"
             gecko:enableRoundCorners="false"
             tools:background="@drawable/favicon_globe" />
 
         <ImageView
             android:id="@+id/menu"
             android:layout_width="wrap_content"
-            android:layout_height="20dp"
+            android:layout_height="36dp"
+            android:layout_margin="2dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
             android:layout_gravity="right|top"
-            android:padding="2dp"
             android:contentDescription="@string/menu"
-            android:layout_marginLeft="@dimen/activity_stream_base_margin"
-            android:layout_marginBottom="@dimen/activity_stream_base_margin"
-            android:src="@drawable/menu" />
+            android:src="@drawable/menu"
+            android:padding="@dimen/activity_stream_base_margin" />
 
         <TextView
             android:id="@+id/page"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="twitter"
             android:textSize="12sp"
             android:textColor="@color/activity_stream_subtitle"
             android:layout_toRightOf="@id/icon"
             android:layout_toEndOf="@id/icon"
             android:layout_toLeftOf="@id/menu"
             android:layout_toStartOf="@id/menu"
+            android:paddingTop="@dimen/activity_stream_base_margin"
             android:paddingLeft="@dimen/activity_stream_base_margin"
             android:paddingStart="@dimen/activity_stream_base_margin"/>
 
         <TextView
             android:id="@+id/card_history_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_toEndOf="@id/icon"
@@ -80,17 +83,20 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:layout_toRightOf="@id/icon"
             android:layout_toEndOf="@id/icon"
             android:layout_alignParentBottom="true"
             android:paddingLeft="@dimen/activity_stream_base_margin"
             android:paddingStart="@dimen/activity_stream_base_margin"
+            android:paddingRight="@dimen/activity_stream_base_margin"
+            android:paddingEnd="@dimen/activity_stream_base_margin"
             android:paddingTop="4dp"
+            android:paddingBottom="@dimen/activity_stream_base_margin"
             android:gravity="center_vertical"
             android:layout_below="@id/card_history_label">
 
             <ImageView
                 android:id="@+id/source_icon"
                 android:layout_width="12dp"
                 android:layout_height="12dp" />