From b79df0ba8fa762f246379f90d2dea4d4eba7e42c Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Thu, 15 Oct 2020 15:01:21 -0400
Subject: [PATCH] For #14922: Use padding instead of margin to use the full
 screen width for the "Add search engine" button

---
 .../layout/preference_search_add_engine.xml   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/layout/preference_search_add_engine.xml b/app/src/main/res/layout/preference_search_add_engine.xml
index df0663e1c2..32d33ab8b3 100644
--- a/app/src/main/res/layout/preference_search_add_engine.xml
+++ b/app/src/main/res/layout/preference_search_add_engine.xml
@@ -2,37 +2,39 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_height="@dimen/search_engine_radio_button_height"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_height="@dimen/search_engine_radio_button_height"
     android:background="?android:selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:layout_marginStart="@dimen/top_bar_alignment_margin_start">
+    android:paddingStart="@dimen/top_bar_alignment_margin_start"
+    tools:ignore="RtlSymmetry">
+
     <ImageView
         android:id="@+id/add_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:importantForAccessibility="no"
         android:textAlignment="textStart"
-        app:srcCompat="@drawable/ic_new"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:srcCompat="@drawable/ic_new" />
+
     <TextView
         android:id="@+id/add_engine_text"
-        android:textColor="?primaryText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/radio_button_padding_horizontal"
         android:layout_marginEnd="@dimen/radio_button_padding_horizontal"
         android:text="@string/search_engine_add_custom_search_engine_title"
+        android:textColor="?primaryText"
         android:textSize="16sp"
-        app:layout_constraintStart_toEndOf="@id/add_icon"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/add_icon"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>