Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9af0403e authored by alinazaidi's avatar alinazaidi Committed by Alina Zaidi
Browse files

Show a message on focussed display if biometric prompt is triggered from a non-default display

Bug: 419799860
Flag: com.android.window.flags.show_biometric_prompt_secondary_display_toast
Test: atest com.android.systemui.biometrics.AuthControllerTest

Change-Id: I1f7da07b80bba7c6b3a13d2d51995f0f1b6a1d8b
parent 60403a35
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -299,6 +299,9 @@ public enum DesktopExperienceFlags {
    RESPECT_FULLSCREEN_ACTIVITY_OPTION_IN_DESKTOP_LAUNCH_PARAMS(
            Flags::respectFullscreenActivityOptionInDesktopLaunchParams, true,
            Flags.FLAG_RESPECT_FULLSCREEN_ACTIVITY_OPTION_IN_DESKTOP_LAUNCH_PARAMS),
    SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_TOAST(
            Flags::showBiometricPromptSecondaryDisplayToast, true,
            Flags.FLAG_SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_TOAST),
    SKIP_DEACTIVATION_OF_DESK_WITH_NOTHING_IN_FRONT(
            Flags::skipDeactivationOfDeskWithNothingInFront, true,
            Flags.FLAG_SKIP_DEACTIVATION_OF_DESK_WITH_NOTHING_IN_FRONT),
+10 −0
Original line number Diff line number Diff line
@@ -1684,6 +1684,16 @@ flag {
    }
}

flag {
    name: "show_biometric_prompt_secondary_display_toast"
    namespace: "systemui"
    description: "Shows a toast on secondary screens to direct users to use their device to finish biometric authorization"
    bug: "419799860"
    metadata {
         purpose: PURPOSE_BUGFIX
    }
}

flag {
    name: "show_desktop_experience_dev_option"
    namespace: "lse_desktop_experience"
+5 −0
Original line number Diff line number Diff line
@@ -2012,6 +2012,11 @@
    <!-- Subtitle shown on the system-provided biometric dialog, asking the user to authenticate with a biometric (e.g. fingerprint or face) or their screen lock credential (i.e. PIN, pattern, or password). [CHAR LIMIT=90] -->
    <string name="biometric_or_screen_lock_dialog_default_subtitle">Use your biometric or screen lock to continue</string>
    <!-- Message shown on secondary screens to direct users to use their phone to finish biometric authorization [CHAR LIMIT=NONE] -->
    <string name="biometric_dialog_secondary_display_toast" product="default">Verify it\'s you on your phone to continue</string>
    <!-- Message shown on secondary screens to direct users to use their tablet to finish biometric authorization [CHAR LIMIT=NONE] -->
    <string name="biometric_dialog_secondary_display_toast" product="tablet">Verify it\'s you on your tablet to continue</string>
    <!-- Message shown when biometric hardware is not available [CHAR LIMIT=50] -->
    <string name="biometric_error_hw_unavailable">Biometric hardware unavailable</string>
    <!-- Message shown when biometric authentication was canceled by the user [CHAR LIMIT=50] -->
+1 −0
Original line number Diff line number Diff line
@@ -2792,6 +2792,7 @@
  <java-symbol type="string" name="biometric_dialog_default_title" />
  <java-symbol type="string" name="biometric_dialog_default_subtitle" />
  <java-symbol type="string" name="biometric_or_screen_lock_dialog_default_subtitle" />
  <java-symbol type="string" name="biometric_dialog_secondary_display_toast" />
  <java-symbol type="string" name="biometric_error_hw_unavailable" />
  <java-symbol type="string" name="biometric_error_user_canceled" />
  <java-symbol type="string" name="biometric_not_recognized" />
+9 −1
Original line number Diff line number Diff line
@@ -97,7 +97,9 @@ import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteracto
import com.android.systemui.biometrics.ui.viewmodel.CredentialViewModel;
import com.android.systemui.biometrics.ui.viewmodel.PromptFallbackViewModel;
import com.android.systemui.biometrics.ui.viewmodel.PromptViewModel;
import com.android.systemui.display.data.repository.FocusedDisplayRepository;
import com.android.systemui.keyguard.WakefulnessLifecycle;
import com.android.systemui.kosmos.KosmosJavaAdapter;
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.VibratorHelper;
import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -138,6 +140,11 @@ public class AuthControllerTest extends SysuiTestCase {
    public final CheckFlagsRule mCheckFlagsRule =
            DeviceFlagsValueProvider.createCheckFlagsRule();

    private final KosmosJavaAdapter mKosmos = new KosmosJavaAdapter(this);

    private final FocusedDisplayRepository mFocusedDisplayRepository =
            mKosmos.getFakeFocusedDisplayRepository();

    @Mock
    private PackageManager mPackageManager;
    @Mock
@@ -1268,7 +1275,8 @@ public class AuthControllerTest extends SysuiTestCase {
                    () -> mLogContextInteractor, () -> mPromptSelectionInteractor,
                    () -> mCredentialViewModel, () -> mPromptViewModel, mInteractionJankMonitor,
                    mHandler, mBackgroundExecutor, mUdfpsUtils, mVibratorHelper, mKeyguardManager,
                    mMSDLPlayer, mWindowManagerProvider, mFallbackViewModelFactory);
                    mMSDLPlayer, mWindowManagerProvider, mFallbackViewModelFactory,
                    mFocusedDisplayRepository);
        }

        @Override
Loading