From ca30fef579f011d545132c151aeafdf6f843a3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hakk=C4=B1=20Kaan=20=C3=87al=C4=B1=C5=9Fkan?=
 <caliskanhkaan@gmail.com>
Date: Mon, 13 Jul 2020 14:16:28 +0300
Subject: [PATCH] For #12106: Follow ux mock on Settings --> Logins screen

---
 app/src/main/res/layout/logins_item.xml     | 50 +++++++++++----------
 app/src/main/res/xml/logins_preferences.xml | 15 +++----
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/layout/logins_item.xml b/app/src/main/res/layout/logins_item.xml
index 14f25e3af..6a311748a 100644
--- a/app/src/main/res/layout/logins_item.xml
+++ b/app/src/main/res/layout/logins_item.xml
@@ -1,11 +1,8 @@
 <?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"
+<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"
@@ -15,34 +12,41 @@
     android:focusable="true"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
-    <ImageView
-        android:id="@+id/favicon_image"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+    <FrameLayout
+        android:id="@+id/favicon_wrapper"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:padding="4dp"
         android:layout_marginStart="16dp"
-        android:adjustViewBounds="true"
-        android:importantForAccessibility="no"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
+        android:background="@drawable/top_sites_background"
+        android:layout_gravity="center"
+        android:importantForAccessibility="noHideDescendants"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+        <ImageView
+            android:id="@+id/favicon_image"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            android:adjustViewBounds="true"
+            android:importantForAccessibility="no"
+            android:scaleType="fitCenter" />
+    </FrameLayout>
 
     <TextView
         android:id="@+id/webAddressView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
-        android:layout_weight="1"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="48dp"
         android:ellipsize="middle"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:textColor="?primaryText"
         app:layout_constraintBottom_toTopOf="@id/usernameView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/favicon_image"
+        app:layout_constraintStart_toEndOf="@+id/favicon_wrapper"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="mozilla.org" />
@@ -51,16 +55,14 @@
         android:id="@+id/usernameView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
-        android:layout_weight="1"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="48dp"
         android:ellipsize="middle"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:singleLine="true"
         android:textColor="?secondaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/favicon_image"
+        app:layout_constraintStart_toEndOf="@+id/favicon_wrapper"
         app:layout_constraintTop_toBottomOf="@id/webAddressView"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="mozilla.org" />
diff --git a/app/src/main/res/xml/logins_preferences.xml b/app/src/main/res/xml/logins_preferences.xml
index 118905d43..f71114007 100644
--- a/app/src/main/res/xml/logins_preferences.xml
+++ b/app/src/main/res/xml/logins_preferences.xml
@@ -2,25 +2,20 @@
 <!-- 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.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.preference.Preference
-        app:iconSpaceReserved="false"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
         android:key="@string/pref_key_save_logins_settings"
         android:summary="@string/preferences_passwords_save_logins_ask_to_save"
         android:title="@string/preferences_passwords_save_logins" />
     <SwitchPreference
-        app:iconSpaceReserved="false"
         android:defaultValue="true"
         android:key="@string/pref_key_autofill_logins"
         android:title="@string/preferences_passwords_autofill" />
-    <androidx.preference.Preference
-        app:iconSpaceReserved="false"
+    <Preference
         android:key="@string/pref_key_password_sync_logins"
         android:summary="@string/preferences_passwords_sync_logins_off"
         android:title="@string/preferences_passwords_sync_logins" />
-    <androidx.preference.Preference
-        app:iconSpaceReserved="false"
+    <Preference
         android:key="@string/pref_key_saved_logins"
         android:title="@string/preferences_passwords_saved_logins" />
-</androidx.preference.PreferenceScreen>
+</PreferenceScreen>