diff --git a/app/src/main/java/org/mozilla/fenix/GlobalDirections.kt b/app/src/main/java/org/mozilla/fenix/GlobalDirections.kt
index 86987b08e..eb64e044b 100644
--- a/app/src/main/java/org/mozilla/fenix/GlobalDirections.kt
+++ b/app/src/main/java/org/mozilla/fenix/GlobalDirections.kt
@@ -5,6 +5,7 @@
package org.mozilla.fenix
import androidx.navigation.NavDirections
+import mozilla.appservices.places.BookmarkRoot
/**
* Used with [HomeActivity] global navigation to indicate which fragment is being opened.
@@ -14,6 +15,14 @@ import androidx.navigation.NavDirections
*/
enum class GlobalDirections(val navDirections: NavDirections, val destinationId: Int) {
Home(NavGraphDirections.actionGlobalHome(), R.id.homeFragment),
+ Bookmarks(
+ NavGraphDirections.actionGlobalBookmarkFragment(BookmarkRoot.Root.id),
+ R.id.bookmarkFragment
+ ),
+ History(
+ NavGraphDirections.actionGlobalHistoryFragment(),
+ R.id.historyFragment
+ ),
Settings(
NavGraphDirections.actionGlobalSettingsFragment(),
R.id.settingsFragment
@@ -37,5 +46,13 @@ enum class GlobalDirections(val navDirections: NavDirections, val destinationId:
SettingsAddonManager(
NavGraphDirections.actionGlobalSettingsAddonsManagementFragment(),
R.id.addonsManagementFragment
+ ),
+ SettingsLogins(
+ NavGraphDirections.actionGlobalSavedLoginsAuthFragment(),
+ R.id.saveLoginSettingFragment
+ ),
+ SettingsTrackingProtection(
+ NavGraphDirections.actionGlobalTrackingProtectionFragment(),
+ R.id.trackingProtectionFragment
)
}
diff --git a/app/src/main/java/org/mozilla/fenix/home/intent/DeepLinkIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/home/intent/DeepLinkIntentProcessor.kt
index cb1a1922e..4b05ada34 100644
--- a/app/src/main/java/org/mozilla/fenix/home/intent/DeepLinkIntentProcessor.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/intent/DeepLinkIntentProcessor.kt
@@ -4,11 +4,12 @@
package org.mozilla.fenix.home.intent
+import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.os.Build.VERSION.SDK_INT
-import android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS
+import android.provider.Settings
import androidx.navigation.NavController
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.GlobalDirections
@@ -39,12 +40,22 @@ class DeepLinkIntentProcessor(
val globalDirections = when (deepLink.host) {
"home", "enable_private_browsing" -> GlobalDirections.Home
+ "home_bookmarks" -> GlobalDirections.Bookmarks
+ "home_history" -> GlobalDirections.History
"settings" -> GlobalDirections.Settings
"turn_on_sync" -> GlobalDirections.Sync
"settings_search_engine" -> GlobalDirections.SearchEngine
"settings_accessibility" -> GlobalDirections.Accessibility
"settings_delete_browsing_data" -> GlobalDirections.DeleteData
"settings_addon_manager" -> GlobalDirections.SettingsAddonManager
+ "settings_logins" -> GlobalDirections.SettingsLogins
+ "settings_tracking_protection" -> GlobalDirections.SettingsTrackingProtection
+ // We'd like to highlight views within the fragment
+ // https://github.com/mozilla-mobile/fenix/issues/11856
+ // The current version of UI has these features in more complex screens.
+ "settings_privacy" -> GlobalDirections.Settings
+ "home_collections" -> GlobalDirections.Home
+
else -> return
}
@@ -63,7 +74,7 @@ class DeepLinkIntentProcessor(
}
"make_default_browser" -> {
if (SDK_INT >= Build.VERSION_CODES.N) {
- val settingsIntent = Intent(ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
+ val settingsIntent = Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
activity.startActivity(settingsIntent)
}
}
@@ -76,6 +87,39 @@ class DeepLinkIntentProcessor(
)
}
}
+ "settings_notifications" -> {
+ val intent = notificationSettings(activity)
+ activity.startActivity(intent)
+ }
}
}
+
+ private fun notificationSettings(context: Context, channel: String? = null) =
+ Intent().apply {
+ when {
+ SDK_INT >= Build.VERSION_CODES.O -> {
+ action = channel?.let {
+ putExtra(Settings.EXTRA_CHANNEL_ID, it)
+ Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS
+ } ?: Settings.ACTION_APP_NOTIFICATION_SETTINGS
+ putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+ }
+ SDK_INT >= Build.VERSION_CODES.LOLLIPOP -> {
+ action = "android.settings.APP_NOTIFICATION_SETTINGS"
+ putExtra("app_package", context.packageName)
+ putExtra("app_uid", context.applicationInfo.uid)
+ }
+ else -> {
+ action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+ addCategory(Intent.CATEGORY_DEFAULT)
+ data = Uri.parse("package:" + context.packageName)
+ }
+ }
+ }
+ .apply {
+ when {
+ SDK_INT >= Build.VERSION_CODES.P ->
+ addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ }
+ }
}
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index e3b1859cb..b01087482 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -99,6 +99,9 @@
+