Merge #5939

5939: Closes #5937: Update add_on list item title overflow fix r=Amejia481 a=psymoon Co-authored-by: Simon Chae <chaesmn@gmail.com>
mozilla-mobile · Feb 14, 2020 · 1a11c13 · 1a11c13
2 parents feddd36 + 0514681
commit 1a11c13
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/components/feature/addons/src/main/res/layout/mozac_feature_addons_item.xml b/components/feature/addons/src/main/res/layout/mozac_feature_addons_item.xml
@@ -54,6 +54,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textStyle="bold"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:layout_marginBottom="6dp"
                 tools:text="uBlock Origin" />
 

diff --git a/components/feature/addons/src/main/res/layout/mozac_feature_addons_unsupported_item.xml b/components/feature/addons/src/main/res/layout/mozac_feature_addons_unsupported_item.xml
@@ -20,32 +20,32 @@
         android:src="@drawable/mozac_ic_extensions"
         android:tint="?android:attr/textColorPrimary" />
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
             android:id="@+id/add_on_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_toStartOf="@+id/add_on_remove_button"
+            android:layout_centerVertical="true"
             android:textSize="18sp"
+            android:ellipsize="end"
+            android:maxLines="1"
             tools:text="uBlock Origin" />
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
         <ImageButton
             android:id="@+id/add_on_remove_button"
             android:layout_width="48dp"
             android:layout_height="48dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/mozac_feature_addons_remove"
             android:src="@drawable/mozac_ic_delete"
             android:tint="?android:attr/textColorPrimary" />
-    </LinearLayout>
+    </RelativeLayout>
 </LinearLayout>