From e7bc266578d01c05621a227f68cd86948184debe Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Wed, 17 Jun 2020 14:25:27 +0300
Subject: [PATCH] For #11665: Adjust visual design for delete browsing data
 screens.

---
 .../res/layout/checkbox_left_preference.xml   |  7 +--
 .../delete_browsing_category_checkbox.xml     | 52 -------------------
 .../res/layout/delete_browsing_data_item.xml  |  6 ++-
 .../res/layout/preference_category_empty.xml  |  4 ++
 app/src/main/res/values/strings.xml           |  2 -
 .../delete_browsing_data_quit_preferences.xml | 15 +++---
 6 files changed, 20 insertions(+), 66 deletions(-)
 delete mode 100644 app/src/main/res/layout/delete_browsing_category_checkbox.xml
 create mode 100644 app/src/main/res/layout/preference_category_empty.xml

diff --git a/app/src/main/res/layout/checkbox_left_preference.xml b/app/src/main/res/layout/checkbox_left_preference.xml
index 6f9440679..3fc661557 100644
--- a/app/src/main/res/layout/checkbox_left_preference.xml
+++ b/app/src/main/res/layout/checkbox_left_preference.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
+<?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"
@@ -7,12 +6,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="48dp"
+    android:layout_marginBottom="8dp"
     android:background="?android:selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
     android:paddingStart="16dp"
-    android:layout_marginBottom="8dp"
     android:paddingEnd="16dp">
 
     <LinearLayout
@@ -29,6 +28,7 @@
         android:id="@android:id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
         android:textColor="@color/state_list_text_color"
         android:textSize="16sp"
         app:layout_constraintBottom_toTopOf="@android:id/summary"
@@ -42,6 +42,7 @@
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
         android:textColor="@color/secondary_state_list_text_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/delete_browsing_category_checkbox.xml b/app/src/main/res/layout/delete_browsing_category_checkbox.xml
deleted file mode 100644
index fcc2cd5b8..000000000
--- a/app/src/main/res/layout/delete_browsing_category_checkbox.xml
+++ /dev/null
@@ -1,52 +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="wrap_content"
-    android:background="?android:selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="8dp"
-    android:paddingEnd="?android:attr/scrollbarSize">
-
-    <LinearLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="48dp"
-        android:layout_height="0dp"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textColor="@color/state_list_text_color"
-        android:textSize="16sp"
-        app:layout_constraintBottom_toTopOf="@android:id/summary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@android:id/widget_frame"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Delete browsing data category" />
-
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textColor="@color/secondary_state_list_text_color"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@android:id/widget_frame"
-        app:layout_constraintTop_toBottomOf="@android:id/title"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Delete browsing data summary" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/delete_browsing_data_item.xml b/app/src/main/res/layout/delete_browsing_data_item.xml
index 78dc94669..4567f295c 100644
--- a/app/src/main/res/layout/delete_browsing_data_item.xml
+++ b/app/src/main/res/layout/delete_browsing_data_item.xml
@@ -27,6 +27,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
         android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         android:clickable="false"
         android:textAppearance="@style/ListItemTextStyle"
         app:layout_constraintBottom_toTopOf="@id/subtitle"
@@ -42,8 +44,10 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
         android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         android:clickable="false"
-        android:textAppearance="@style/SubtitleTextStyle"
+        android:textColor="@color/secondary_state_list_text_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/checkbox"
diff --git a/app/src/main/res/layout/preference_category_empty.xml b/app/src/main/res/layout/preference_category_empty.xml
new file mode 100644
index 000000000..f0b60c1d1
--- /dev/null
+++ b/app/src/main/res/layout/preference_category_empty.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="0dp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b72708d4..408eb6093 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -871,8 +871,6 @@
     <string name="preference_summary_delete_browsing_data_on_quit">Automatically deletes browsing data when you select "Quit" from the main menu</string>
     <!-- Summary for the Delete browsing data on quit preference. "Quit" translation should match delete_browsing_data_on_quit_action translation. -->
     <string name="preference_summary_delete_browsing_data_on_quit_2">Automatically deletes browsing data when you select \"Quit\" from the main menu</string>
-    <!-- Category for history items to delete on quit in delete browsing data on quit -->
-    <string name="preferences_delete_browsing_data_on_quit_browsing_history">Browsing history</string>
     <!-- Action item in menu for the Delete browsing data on quit feature -->
     <string name="delete_browsing_data_on_quit_action">Quit</string>
 
diff --git a/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml b/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
index 3e09f77b4..698061010 100644
--- a/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
+++ b/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
@@ -5,7 +5,6 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <SwitchPreference
-        app:iconSpaceReserved="false"
         android:defaultValue="false"
         android:key="@string/pref_key_delete_browsing_data_on_quit"
         android:summary="@string/preference_summary_delete_browsing_data_on_quit_2"
@@ -15,28 +14,28 @@
         android:key="@string/pref_key_delete_browsing_data_on_quit_categories"
         app:allowDividerAbove="false"
         app:iconSpaceReserved="false"
-        android:layout="@layout/preference_cat_style">
+        android:layout="@layout/preference_category_empty">
         <CheckBoxPreference
             android:key="@string/pref_key_delete_open_tabs_on_quit"
-            android:layout="@layout/delete_browsing_category_checkbox"
+            android:layout="@layout/checkbox_left_preference"
             android:title="@string/preferences_delete_browsing_data_tabs_title_2" />
         <CheckBoxPreference
             android:key="@string/pref_key_delete_browsing_history_on_quit"
-            android:layout="@layout/delete_browsing_category_checkbox"
-            android:title="@string/preferences_delete_browsing_data_on_quit_browsing_history" />
+            android:layout="@layout/checkbox_left_preference"
+            android:title="@string/preferences_delete_browsing_data_browsing_data_title" />
         <CheckBoxPreference
             android:key="@string/pref_key_delete_cookies_on_quit"
-            android:layout="@layout/delete_browsing_category_checkbox"
+            android:layout="@layout/checkbox_left_preference"
             android:summary="@string/preferences_delete_browsing_data_cookies_subtitle"
             android:title="@string/preferences_delete_browsing_data_cookies" />
         <CheckBoxPreference
             android:key="@string/pref_key_delete_caches_on_quit"
-            android:layout="@layout/delete_browsing_category_checkbox"
+            android:layout="@layout/checkbox_left_preference"
             android:summary="@string/preferences_delete_browsing_data_cached_files_subtitle"
             android:title="@string/preferences_delete_browsing_data_cached_files" />
         <CheckBoxPreference
             android:key="@string/pref_key_delete_permissions_on_quit"
-            android:layout="@layout/delete_browsing_category_checkbox"
+            android:layout="@layout/checkbox_left_preference"
             android:title="@string/preferences_delete_browsing_data_site_permissions" />
     </PreferenceCategory>
 </androidx.preference.PreferenceScreen>