From 92397a4ce46230ba6bca605769a0c4a3696d6841 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Sun, 23 Feb 2020 09:56:05 -0800
Subject: [PATCH] [fenix] Reverts For
 https://github.com/mozilla-mobile/fenix/issues/7559 - allows changing locale
 even after setting theme with

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt    | 10 ----------
 .../mozilla/fenix/settings/PrivateBrowsingFragment.kt  |  7 +++----
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 35569c7fd..0f29c0ae2 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -6,7 +6,6 @@ package org.mozilla.fenix
 
 import android.content.Context
 import android.content.Intent
-import android.content.res.Configuration
 import android.os.Bundle
 import android.util.AttributeSet
 import android.view.View
@@ -100,15 +99,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity() {
         )
     }
 
-    override fun applyOverrideConfiguration(overrideConfiguration: Configuration?) {
-        if (overrideConfiguration != null) {
-            val uiMode = overrideConfiguration.uiMode
-            overrideConfiguration.setTo(baseContext.resources.configuration)
-            overrideConfiguration.uiMode = uiMode
-        }
-        super.applyOverrideConfiguration(overrideConfiguration)
-    }
-
     final override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt
index aef11af21..85793e152 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.settings
 
 import android.os.Bundle
+import android.util.Log
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
@@ -14,6 +15,7 @@ import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.metrics
 import org.mozilla.fenix.ext.showToolbar
+import org.mozilla.fenix.utils.Settings
 
 /**
  * Lets the user customize Private browsing options.
@@ -39,10 +41,7 @@ class PrivateBrowsingFragment : PreferenceFragmentCompat() {
         }
 
         findPreference<SwitchPreference>(getPreferenceKey(R.string.pref_key_open_links_in_a_private_tab))?.apply {
-            setOnPreferenceClickListener {
-                onPreferenceChangeListener = SharedPreferenceUpdater()
-                true
-            }
+            onPreferenceChangeListener = SharedPreferenceUpdater()
         }
     }
 }