From 5c5d3b8ab853a8e486c728ba43bac8bb7f6b2ed6 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Mon, 16 Sep 2019 13:58:06 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/5368 - Make every blocking
 category gone by default

---
 .../res/layout/component_tracking_protection_panel.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/component_tracking_protection_panel.xml b/app/src/main/res/layout/component_tracking_protection_panel.xml
index e37dad4f5b..aebd3ab245 100644
--- a/app/src/main/res/layout/component_tracking_protection_panel.xml
+++ b/app/src/main/res/layout/component_tracking_protection_panel.xml
@@ -32,8 +32,8 @@
             android:layout_height="wrap_content"
             android:minHeight="@dimen/tracking_protection_item_height"
             android:text="@string/preference_enhanced_tracking_protection"
-            app:layout_constraintTop_toBottomOf="@id/url"
             app:layout_constraintBottom_toTopOf="@id/blocking_header"
+            app:layout_constraintTop_toBottomOf="@id/url"
             app:switchDescription="@string/etp_panel_on"
             app:switchIcon="@drawable/ic_tracking_protection"
             app:switchTitle="@string/preference_enhanced_tracking_protection" />
@@ -46,6 +46,7 @@
             android:text="@string/enhanced_tracking_protection_blocked"
             android:textColor="?attr/primaryText"
             android:textStyle="bold"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tracking_protection" />
 
@@ -56,6 +57,7 @@
             android:layout_height="@dimen/tracking_protection_item_height"
             android:drawableStart="@drawable/ic_cookies"
             android:text="@string/etp_cookies_title"
+            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/blocking_header" />
 
         <TextView
@@ -65,6 +67,7 @@
             android:layout_height="@dimen/tracking_protection_item_height"
             android:drawableStart="@drawable/ic_fingerprinters"
             android:text="@string/etp_fingerprinters_title"
+            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/cross_site_tracking" />
 
         <TextView
@@ -74,6 +77,7 @@
             android:layout_height="@dimen/tracking_protection_item_height"
             android:drawableStart="@drawable/ic_cryptominers"
             android:text="@string/etp_cryptominers_title"
+            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/fingerprinters" />
 
         <TextView
@@ -83,6 +87,7 @@
             android:layout_height="@dimen/tracking_protection_item_height"
             android:drawableStart="@drawable/ic_social_media_trackers"
             android:text="@string/etp_social_media_trackers_title"
+            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/cryptominers" />
 
         <TextView
@@ -92,6 +97,7 @@
             android:layout_height="@dimen/tracking_protection_item_height"
             android:drawableStart="@drawable/ic_tracking_content"
             android:text="@string/etp_tracking_content_title"
+            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/social_media_trackers" />
 
         <TextView
@@ -167,9 +173,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            app:drawableStartCompat="@drawable/ic_settings"
             android:paddingEnd="24dp"
             android:text="@string/etp_settings"
+            app:drawableStartCompat="@drawable/ic_settings"
             app:layout_constraintTop_toBottomOf="@id/line_divider" />
     </androidx.constraintlayout.widget.ConstraintLayout>