fixup! TB 44027: [android] Update PBM lockscreen (51535400) · Commits · The Tor Project / Applications / Tor Browser

mobile/android/fenix/app/nimbus.fml.yaml

+1 −1

Changes for mobile/android/fenix/app/nimbus.fml.yaml: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -913,7 +913,7 @@ features:
		description: >
		Whether or not to enable private browsing mode lock.
		type: Boolean
		default: false
		default: true

		app-links:
		description: Control behavior of app links handling in the browser.

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/pbmlock/UnlockPrivateTabsScreen.kt

+6 −6

Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/pbmlock/UnlockPrivateTabsScreen.kt: 6 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -96,14 +96,14 @@ private fun Logo() {
		) {
		Image(
		modifier = Modifier.padding(end = 14.dp),
		painter = painterResource(getResolvedAttrResId(R.attr.fenixWordmarkLogo)),
		painter = painterResource(R.drawable.tor_browser_app_icon),
		contentDescription = null,
		)

		Image(
		modifier = Modifier.height(28.dp),
		painter = painterResource(getResolvedAttrResId(R.attr.fenixWordmarkText)),
		contentDescription = stringResource(R.string.app_name),
		Text(
		text = stringResource(R.string.app_name),
		style = FirefoxTheme.typography.headline5,
		maxLines = 1,
		)
		}
		}
		@@ -130,7 +130,7 @@ private fun Footer(onUnlockClicked: () -> Unit, onLeaveClicked: () -> Unit, show

		Spacer(modifier = Modifier.height(8.dp))

		if (showNegativeButton) {
		if (false) {
		TextButton(
		text = stringResource(R.string.pbm_authentication_leave_private_tabs),
		onClick = onLeaveClicked,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt

+4 −4

Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt: 4 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -65,8 +65,8 @@ class TabsSettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm
		private lateinit var startForResult: ActivityResultLauncher<Intent>

		private fun onSuccessfulAuthenticationUsingFallbackPrompt() {
		val newValue = !requireContext().components.settings.privateBrowsingLockedFeatureEnabled
		requireContext().components.settings.privateBrowsingLockedFeatureEnabled = newValue
		val newValue = !requireContext().components.settings.privateBrowsingModeLocked
		requireContext().components.settings.privateBrowsingModeLocked = newValue
		// Update switch state manually
		requirePreference<SwitchPreferenceCompat>(R.string.pref_key_private_browsing_locked_enabled).apply {
		isChecked = !isChecked
		@@ -77,7 +77,7 @@ class TabsSettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm
		pbmLockEnabled: Boolean,
		preference: Preference,
		) {
		requireContext().components.settings.privateBrowsingLockedFeatureEnabled = pbmLockEnabled
		requireContext().components.settings.privateBrowsingModeLocked = pbmLockEnabled
		// Update switch state manually
		(preference as? SwitchPreferenceCompat)?.isChecked = pbmLockEnabled
		}
		@@ -151,7 +151,7 @@ class TabsSettingsFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm
		requirePreference<SwitchPreferenceCompat>(R.string.pref_key_private_browsing_locked_enabled).apply {
		title = getString(R.string.preferences_tor_lock_screen_title, getString(R.string.app_name))
		summary = getString(R.string.preferences_tor_lock_screen_summary, getString(R.string.app_name))
		isChecked = context.components.settings.privateBrowsingLockedFeatureEnabled &&
		isChecked = context.components.settings.privateBrowsingModeLocked &&
		biometricManager.isAuthenticatorAvailable()
		isVisible = deviceCapable
		isEnabled = userHasEnabledCapability