From 90c9e634afda589b7d4ba384aa63f1b676db42d9 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Tue, 20 Apr 2021 14:31:23 +0300
Subject: [PATCH] For #18240: Adjust preference screen to fit UX specs.

---
 ...reference_credit_cards_add_credit_card.xml | 40 -------------------
 app/src/main/res/values/dimens.xml            |  7 ----
 .../main/res/xml/credit_cards_preferences.xml |  6 ++-
 3 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 app/src/main/res/layout/preference_credit_cards_add_credit_card.xml

diff --git a/app/src/main/res/layout/preference_credit_cards_add_credit_card.xml b/app/src/main/res/layout/preference_credit_cards_add_credit_card.xml
deleted file mode 100644
index 41c8b247c..000000000
--- a/app/src/main/res/layout/preference_credit_cards_add_credit_card.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/credit_cards_add_credit_card_button_height"
-    android:background="?android:selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    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:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_new" />
-
-    <TextView
-        android:id="@+id/add_credit_card_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/credit_cards_add_credit_card_text_horizontal_margin"
-        android:layout_marginEnd="@dimen/credit_cards_add_credit_card_text_horizontal_margin"
-        android:text="@string/preferences_credit_cards_add_credit_card"
-        android:textColor="?primaryText"
-        android:textSize="@dimen/credit_cards_add_credit_card_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/add_icon"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e2c8297ae..88cf1973d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -214,13 +214,6 @@
     <dimen name="top_sites_text_margin_top">8dp</dimen>
 
     <!-- Credit Cards Fragment -->
-    <!-- The height of the "Add credit card" button in the Credit Cards fragment.
-         This should be the same value as search_engine_radio_button_height. -->
-    <dimen name="credit_cards_add_credit_card_button_height">48dp</dimen>
-    <!-- The horizontal margin for the "Add credit card" text.
-         This should be the same value as radio_button_padding_horizontal. -->
-    <dimen name="credit_cards_add_credit_card_text_horizontal_margin">16dp</dimen>
-    <dimen name="credit_cards_add_credit_card_text_size">16sp</dimen>
     <dimen name="credit_cards_saved_cards_item_margin_start">16dp</dimen>
     <dimen name="credit_cards_saved_cards_item_margin_end">48dp</dimen>
 
diff --git a/app/src/main/res/xml/credit_cards_preferences.xml b/app/src/main/res/xml/credit_cards_preferences.xml
index ea745e992..21b58a5c2 100644
--- a/app/src/main/res/xml/credit_cards_preferences.xml
+++ b/app/src/main/res/xml/credit_cards_preferences.xml
@@ -14,10 +14,12 @@
         android:title="@string/preferences_credit_cards_sync_cards_across_devices"
         app:allowDividerBelow="true" />
     <Preference
+        android:icon="@drawable/ic_new"
         android:key="@string/pref_key_credit_cards_add_credit_card"
         android:title="@string/preferences_credit_cards_add_credit_card"
-        android:layout="@layout/preference_credit_cards_add_credit_card" />
+        app:allowDividerAbove="true" />
     <Preference
         android:key="@string/pref_key_credit_cards_manage_saved_cards"
-        android:title="@string/preferences_credit_cards_manage_saved_cards" />
+        android:title="@string/preferences_credit_cards_manage_saved_cards"
+        app:allowDividerAbove="true" />
 </PreferenceScreen>