Unified Diff: mobile/android/base/resources/layout/tabs_item_row.xml
Issue 29330952:
Issue 3127 - Merge conflicts, base 42.0.1 (Closed)
Patch Set:
Created Nov. 26, 2015, 11:01 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png ('k')
|
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: mobile/android/base/resources/layout/tabs_item_row.xml |
| diff --git a/mobile/android/base/resources/layout/tabs_item_row.xml b/mobile/android/base/resources/layout/tabs_item_row.xml |
| index c734d27e312217b92681e724e2c2dc3921dc7562..90b91d2cdec9b230aea4fceea42530ff870778b3 100644 |
| --- a/mobile/android/base/resources/layout/tabs_item_row.xml |
| +++ b/mobile/android/base/resources/layout/tabs_item_row.xml |
| @@ -17,9 +17,9 @@ |
| <!-- We set state_private on this View dynamically in TabsListLayout. --> |
| <org.mozilla.gecko.widget.TabThumbnailWrapper |
| android:id="@+id/wrapper" |
| - android:layout_width="wrap_content" |
| + android:layout_width="wrap_content" |
| android:layout_height="wrap_content" |
| - android:padding="4dip" |
| + android:padding="3dip" |
| android:background="@drawable/tab_thumbnail" |
| android:duplicateParentState="true"> |
| @@ -42,7 +42,7 @@ |
| android:layout_height="0dip" |
| android:layout_weight="1.0" |
| style="@style/TabLayoutItemTextAppearance" |
| - android:textColor="#FFFFFFFF" |
| + android:textColor="@color/abb_thumbnail_row_text" |
| android:textSize="14sp" |
| android:singleLine="false" |
| android:maxLines="4" |
« no previous file with comments
|
« mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png ('k')
|
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml » ('j')
|
no next file with comments »
