From bc53296603d9baf74eb22f49e33f2a9348697fce Mon Sep 17 00:00:00 2001 From: ValentinTimisica Date: Tue, 9 Jun 2020 16:35:55 +0300 Subject: [PATCH] For #11365: Reorganizes 'SettingsFragment' items Moved all the functionality form 'DefaultBrowserSettingsFragment' to 'SettingsFragment'. --- .../org/mozilla/fenix/BrowserDirection.kt | 1 - .../java/org/mozilla/fenix/HomeActivity.kt | 3 - .../DefaultBrowserSettingsFragment.kt | 73 ------------------- .../fenix/settings/SettingsFragment.kt | 40 +++++++++- app/src/main/res/navigation/nav_graph.xml | 10 --- .../res/xml/default_browser_preferences.xml | 11 --- app/src/main/res/xml/preferences.xml | 14 ++-- 7 files changed, 44 insertions(+), 108 deletions(-) delete mode 100644 app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt delete mode 100644 app/src/main/res/xml/default_browser_preferences.xml diff --git a/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt b/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt index 168e5cfca..951d8861b 100644 --- a/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt +++ b/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt @@ -24,7 +24,6 @@ enum class BrowserDirection(@IdRes val fragmentId: Int) { FromExceptions(R.id.exceptionsFragment), FromAbout(R.id.aboutFragment), FromTrackingProtection(R.id.trackingProtectionFragment), - FromDefaultBrowserSettingsFragment(R.id.defaultBrowserSettingsFragment), FromSavedLoginsFragment(R.id.savedLoginsFragment), FromAddNewDeviceFragment(R.id.addNewDeviceFragment), FromAddSearchEngineFragment(R.id.addSearchEngineFragment), diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 3a1ecf382..e7a84aa56 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -70,7 +70,6 @@ import org.mozilla.fenix.library.history.HistoryFragmentDirections import org.mozilla.fenix.perf.Performance import org.mozilla.fenix.perf.StartupTimeline import org.mozilla.fenix.search.SearchFragmentDirections -import org.mozilla.fenix.settings.DefaultBrowserSettingsFragmentDirections import org.mozilla.fenix.settings.SettingsFragmentDirections import org.mozilla.fenix.settings.TrackingProtectionFragmentDirections import org.mozilla.fenix.settings.about.AboutFragmentDirections @@ -384,8 +383,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity() { AboutFragmentDirections.actionGlobalBrowser(customTabSessionId) BrowserDirection.FromTrackingProtection -> TrackingProtectionFragmentDirections.actionGlobalBrowser(customTabSessionId) - BrowserDirection.FromDefaultBrowserSettingsFragment -> - DefaultBrowserSettingsFragmentDirections.actionGlobalBrowser(customTabSessionId) BrowserDirection.FromSavedLoginsFragment -> SavedLoginsAuthFragmentDirections.actionGlobalBrowser(customTabSessionId) BrowserDirection.FromAddNewDeviceFragment -> diff --git a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt deleted file mode 100644 index c8634f9cf..000000000 --- a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt +++ /dev/null @@ -1,73 +0,0 @@ -/* 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/. */ - -package org.mozilla.fenix.settings - -import android.content.Intent -import android.os.Build -import android.os.Build.VERSION.SDK_INT -import android.os.Bundle -import android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS -import androidx.preference.Preference -import androidx.preference.PreferenceFragmentCompat -import org.mozilla.fenix.BrowserDirection -import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.R -import org.mozilla.fenix.ext.getPreferenceKey -import org.mozilla.fenix.ext.showToolbar - -/** - * Lets the user control their default browser preferences - */ -class DefaultBrowserSettingsFragment : PreferenceFragmentCompat() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - val makeDefaultBrowserKey = getPreferenceKey(R.string.pref_key_make_default_browser) - val preferenceMakeDefaultBrowser = findPreference(makeDefaultBrowserKey) - - preferenceMakeDefaultBrowser?.onPreferenceClickListener = - getClickListenerForMakeDefaultBrowser() - } - - override fun onResume() { - super.onResume() - showToolbar(getString(R.string.preferences_set_as_default_browser)) - - updatePreferences() - } - - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { - setPreferencesFromResource(R.xml.default_browser_preferences, rootKey) - updatePreferences() - } - - private fun updatePreferences() { - findPreference(getPreferenceKey(R.string.pref_key_make_default_browser)) - ?.updateSwitch() - } - - private fun getClickListenerForMakeDefaultBrowser(): Preference.OnPreferenceClickListener { - return if (SDK_INT >= Build.VERSION_CODES.N) { - Preference.OnPreferenceClickListener { - val intent = Intent(ACTION_MANAGE_DEFAULT_APPS_SETTINGS) - startActivity(intent) - true - } - } else { - Preference.OnPreferenceClickListener { - (activity as HomeActivity).openToBrowserAndLoad( - searchTermOrURL = SupportUtils.getSumoURLForTopic( - requireContext(), - SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER - ), - newTab = true, - from = BrowserDirection.FromDefaultBrowserSettingsFragment - ) - true - } - } - } -} diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt index 5ddffa766..a538938ff 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt @@ -8,8 +8,10 @@ import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent import android.net.Uri +import android.os.Build import android.os.Bundle import android.os.Handler +import android.provider.Settings import android.widget.Toast import androidx.appcompat.content.res.AppCompatResources import androidx.lifecycle.lifecycleScope @@ -114,6 +116,7 @@ class SettingsFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.preferences, rootKey) + updateMakeDefaultBrowserPreference() } override fun onResume() { @@ -173,6 +176,8 @@ class SettingsFragment : PreferenceFragmentCompat() { requireComponents.backgroundServices.accountManager.accountProfile() ) } + + updateMakeDefaultBrowserPreference() } @Suppress("ComplexMethod", "LongMethod") @@ -208,9 +213,6 @@ class SettingsFragment : PreferenceFragmentCompat() { requireContext().metrics.track(Event.AddonsOpenInSettings) SettingsFragmentDirections.actionSettingsFragmentToAddonsFragment() } - resources.getString(R.string.pref_key_make_default_browser) -> { - SettingsFragmentDirections.actionSettingsFragmentToDefaultBrowserSettingsFragment() - } resources.getString(R.string.pref_key_data_choices) -> { SettingsFragmentDirections.actionSettingsFragmentToDataChoicesFragment() } @@ -289,9 +291,11 @@ class SettingsFragment : PreferenceFragmentCompat() { private fun setupPreferences() { val leakKey = getPreferenceKey(R.string.pref_key_leakcanary) val debuggingKey = getPreferenceKey(R.string.pref_key_remote_debugging) + val makeDefaultBrowserKey = getPreferenceKey(R.string.pref_key_make_default_browser) val preferenceLeakCanary = findPreference(leakKey) val preferenceRemoteDebugging = findPreference(debuggingKey) + val preferenceMakeDefaultBrowser = findPreference(makeDefaultBrowserKey) if (!Config.channel.isReleased) { preferenceLeakCanary?.setOnPreferenceChangeListener { _, newValue -> @@ -308,6 +312,9 @@ class SettingsFragment : PreferenceFragmentCompat() { true } + preferenceMakeDefaultBrowser?.onPreferenceClickListener = + getClickListenerForMakeDefaultBrowser() + val preferenceFxAOverride = findPreference(getPreferenceKey(R.string.pref_key_override_fxa_server)) val preferenceSyncOverride = @@ -335,6 +342,33 @@ class SettingsFragment : PreferenceFragmentCompat() { )?.isVisible = requireContext().settings().showSecretDebugMenuThisSession } + private fun getClickListenerForMakeDefaultBrowser(): Preference.OnPreferenceClickListener { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + Preference.OnPreferenceClickListener { + val intent = Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + startActivity(intent) + true + } + } else { + Preference.OnPreferenceClickListener { + (activity as HomeActivity).openToBrowserAndLoad( + searchTermOrURL = SupportUtils.getSumoURLForTopic( + requireContext(), + SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER + ), + newTab = true, + from = BrowserDirection.FromSettings + ) + true + } + } + } + + private fun updateMakeDefaultBrowserPreference() { + findPreference(getPreferenceKey(R.string.pref_key_make_default_browser)) + ?.updateSwitch() + } + private fun navigateFromSettings(directions: NavDirections) { view?.findNavController()?.let { navController -> if (navController.currentDestination?.id == R.id.settingsFragment) { diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 35891654a..597223d5e 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -446,13 +446,6 @@ app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" app:destination="@id/deleteBrowsingDataOnQuitFragment" /> - - diff --git a/app/src/main/res/xml/default_browser_preferences.xml b/app/src/main/res/xml/default_browser_preferences.xml deleted file mode 100644 index d82e6ab04..000000000 --- a/app/src/main/res/xml/default_browser_preferences.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 3deaa806b..60471bd70 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -73,7 +73,7 @@ android:key="@string/pref_key_language" android:title="@string/preferences_language" /> - @@ -114,12 +114,6 @@ android:key="@string/pref_key_data_choices" android:title="@string/preferences_data_collection" /> - - + +