Commit 135a28c9 authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

TB 44027: [android] Update PBM lockscreen

#44027 Update PBM lockscreen
parent ded5dec8
Loading
Loading
Loading
Loading
+4 −0
Changes for mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/annotation/FlexibleWindowLightDarkPreview.kt: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -74,4 +74,8 @@ import mozilla.components.compose.base.theme.layout.AcornWindowSize
    device = Devices.PIXEL_TABLET,
    uiMode = Configuration.UI_MODE_NIGHT_YES,
)
@Preview(
    name = "Large text",
    fontScale = 2.5f,
)
annotation class FlexibleWindowLightDarkPreview
+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: true
        default: false

  app-links:
    description: Control behavior of app links handling in the browser.
+7.26 KiB
Loading image diff...
+2 −1
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/pbmlock/PrivateBrowsingLockFeature.kt: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ fun Fragment.verifyUser(
    onVerified: (() -> Unit)? = null,
) {
    biometricUtils.bindBiometricsCredentialsPromptOrShowWarning(
        titleRes = R.string.pbm_authentication_unlock_private_tabs,
        titleRes = R.string.tor_authentication_unlock_private_tabs,
        titleRes2 = R.string.app_name,
        view = requireView(),
        onShowPinVerification = { intent -> fallbackVerification.launch(intent) },
        onAuthSuccess = { handleVerificationSuccess(requireContext(), onVerified) },
+4 −4
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/pbmlock/UnlockPrivateTabsFragment.kt: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ class UnlockPrivateTabsFragment : Fragment(), UserInteractionHandler, SystemInse
                UnlockPrivateTabsScreen(
                    onUnlockClicked = { requestPrompt() },
                    onLeaveClicked = {
                        PrivateBrowsingLocked.seeOtherTabsClicked.record()
                        closeFragment()
                        requireActivity().moveTaskToBack(true)
                    },
                    showNegativeButton = !isCustomPrivateTab,
                )
@@ -84,7 +83,7 @@ class UnlockPrivateTabsFragment : Fragment(), UserInteractionHandler, SystemInse
    }

    override fun onBackPressed(): Boolean {
        closeFragment()
        requireActivity().moveTaskToBack(true)
        return true
    }

@@ -108,7 +107,8 @@ class UnlockPrivateTabsFragment : Fragment(), UserInteractionHandler, SystemInse

    private fun requestPrompt() {
        DefaultBiometricUtils.bindBiometricsCredentialsPromptOrShowWarning(
            titleRes = R.string.pbm_authentication_unlock_private_tabs,
            titleRes = R.string.tor_authentication_unlock_private_tabs,
            titleRes2 = R.string.app_name,
            view = requireView(),
            onShowPinVerification = { intent -> startForResult.launch(intent) },
            onAuthSuccess = ::onAuthSuccess,
Loading