From e9edd6c8b53fbd72036133a949fb80876bb3ff7c Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Thu, 18 Apr 2019 13:15:22 -0700
Subject: [PATCH] For #1084 - Remove Exceptions from TP setting for Beta

---
 .../fenix/settings/TrackingProtectionFragment.kt    | 13 -------------
 .../res/xml/tracking_protection_preferences.xml     |  4 +++-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt
index b689df046..7ed80c5ba 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt
@@ -44,18 +44,5 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() {
                 requireContext().components.useCases.sessionUseCases.reload.invoke()
                 true
             }
-
-        // Exceptions
-        val exceptions =
-            context!!.getPreferenceKey(R.string.pref_key_tracking_protection_exceptions)
-        val preferenceExceptions = findPreference<Preference>(exceptions)
-        preferenceExceptions?.onPreferenceClickListener = getClickListenerForSignOut()
-    }
-
-    private fun getClickListenerForSignOut(): Preference.OnPreferenceClickListener {
-        return Preference.OnPreferenceClickListener {
-            // TODO go to Exceptions Fragment
-            true
-        }
     }
 }
diff --git a/app/src/main/res/xml/tracking_protection_preferences.xml b/app/src/main/res/xml/tracking_protection_preferences.xml
index 2ec3f5fcd..8bc3ccded 100644
--- a/app/src/main/res/xml/tracking_protection_preferences.xml
+++ b/app/src/main/res/xml/tracking_protection_preferences.xml
@@ -2,7 +2,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.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <SwitchPreference
         android:defaultValue="true"
         android:icon="@drawable/ic_tracking_protection"
@@ -10,6 +11,7 @@
         android:summary="@string/preferences_tracking_protection_description"
         android:title="@string/preferences_tracking_protection" />
     <Preference
+        app:isPreferenceVisible="false"
         android:icon="@drawable/ic_internet"
         android:key="@string/pref_key_tracking_protection_exceptions"
         android:title="@string/preferences_tracking_protection_exceptions" />