Bug 1396076 - Part 4 - Revert TabsLayoutItemView padding changes for the "close tab" button. r?jwu
We're using Touch- and HoverDelegates to increase the effective clickable area, so there's no need to actually pad the button itself, which disturbs the layout and eats into the space available for displaying the tab's title.
MozReview-Commit-ID: CKS2OIoS1xr
--- a/mobile/android/app/src/main/res/layout-large/tabs_layout_item_view.xml
+++ b/mobile/android/app/src/main/res/layout-large/tabs_layout_item_view.xml
@@ -25,31 +25,29 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
style="@style/TabLayoutItemTextAppearance"
android:textSize="14sp"
android:textColor="@color/tab_item_title"
android:singleLine="true"
android:duplicateParentState="true"
- android:layout_gravity="center_vertical"
gecko:fadeWidth="15dp"
- android:minHeight="24dp"
android:paddingRight="5dp"
android:paddingEnd="5dp"
android:paddingLeft="0dp"
android:paddingStart="0dp"
android:drawablePadding="6dp"/>
<!-- Use of baselineAlignBottom only supported from API 11+ - if this needs to work on lower API versions
we'll need to override getBaseLine() and return image height, but we assume this won't happen -->
<ImageView android:id="@+id/close"
style="@style/TabsItemClose"
- android:layout_width="24dp"
- android:layout_height="24dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:scaleType="center"
android:baselineAlignBottom="true"
android:background="@android:color/transparent"
android:contentDescription="@string/close_tab"
android:src="@drawable/tab_item_close_button"
android:duplicateParentState="true"/>
</LinearLayout>
--- a/mobile/android/app/src/main/res/layout/tabs_layout_item_view.xml
+++ b/mobile/android/app/src/main/res/layout/tabs_layout_item_view.xml
@@ -18,17 +18,17 @@
android:duplicateParentState="true"
android:paddingLeft="@dimen/tab_highlight_stroke_width"
android:paddingRight="@dimen/tab_highlight_stroke_width"
android:paddingBottom="@dimen/tab_highlight_stroke_width">
<org.mozilla.gecko.widget.FadedSingleColorTextView
android:id="@+id/title"
android:layout_width="0dip"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_weight="1.0"
style="@style/TabLayoutItemTextAppearance"
android:textSize="14sp"
android:textColor="@color/tab_item_title"
android:singleLine="true"
android:duplicateParentState="true"
gecko:fadeWidth="15dp"
android:paddingRight="5dp"
@@ -36,18 +36,18 @@
android:paddingLeft="0dp"
android:paddingStart="0dp"
android:drawablePadding="6dp"/>
<!-- Use of baselineAlignBottom only supported from API 11+ - if this needs to work on lower API versions
we'll need to override getBaseLine() and return image height, but we assume this won't happen -->
<ImageView android:id="@+id/close"
style="@style/TabsItemClose"
- android:layout_width="24dp"
- android:layout_height="24dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:scaleType="center"
android:baselineAlignBottom="true"
android:background="@android:color/transparent"
android:contentDescription="@string/close_tab"
android:src="@drawable/tab_item_close_button"
android:duplicateParentState="true"/>
</LinearLayout>