From 80a2b1ef534964f144c02449df5a1b0a02f87c0c Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 3 Apr 2019 16:53:42 -0700
Subject: [PATCH] For #1333 - Correct vertical alignment of history list item

---
 app/src/main/res/layout/history_list_item.xml | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/history_list_item.xml b/app/src/main/res/layout/history_list_item.xml
index 76f806bb1..a0c0ca22e 100644
--- a/app/src/main/res/layout/history_list_item.xml
+++ b/app/src/main/res/layout/history_list_item.xml
@@ -17,41 +17,36 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/history_title" />
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageButton
+        android:id="@+id/history_item_overflow"
+        android:layout_width="@dimen/glyph_button_width"
+        android:layout_height="@dimen/glyph_button_height"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/content_description_history_menu"
+        android:src="@drawable/ic_menu"
+        android:tint="?attr/menuButtonTint"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/history_favicon"
         android:layout_width="@dimen/history_favicon_width_height"
         android:layout_height="@dimen/history_favicon_width_height"
         android:background="@drawable/history_favicon_background"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/history_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="20dp"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/historyTitleColor"
-        android:textSize="18sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/history_favicon"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <TextView
         android:id="@+id/history_url"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="8dp"
         android:ellipsize="end"
         android:singleLine="true"
         android:textAlignment="viewStart"
@@ -62,14 +57,17 @@
         app:layout_constraintStart_toEndOf="@id/history_favicon"
         app:layout_constraintTop_toBottomOf="@id/history_title" />
 
-    <ImageButton
-        android:id="@+id/history_item_overflow"
-        android:layout_width="@dimen/glyph_button_height"
-        android:layout_height="@dimen/glyph_button_height"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/content_description_history_menu"
-        android:src="@drawable/ic_menu"
-        android:tint="?attr/menuButtonTint"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/history_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAlignment="viewStart"
+        android:textColor="?attr/historyTitleColor"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toStartOf="@id/history_item_overflow"
+        app:layout_constraintStart_toEndOf="@id/history_favicon"
+        app:layout_constraintTop_toTopOf="@id/history_item_overflow" />
 </androidx.constraintlayout.widget.ConstraintLayout>