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

Commit 35255dde authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename show_biometric_prompt_secondary_display_toast to trigger a new... 

Merge "Rename show_biometric_prompt_secondary_display_toast to trigger a new gantry workflow." into main
parents 7a1044ec 89d040c9

core/java/android/window/DesktopExperienceFlags.java

+3 −3
Original line number Diff line number Diff line
@@ -315,9 +315,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),

    SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_MESSAGE(

            Flags::showBiometricPromptSecondaryDisplayMessage, true,

            Flags.FLAG_SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_MESSAGE),

    SKIP_DEACTIVATION_OF_DESK_WITH_NOTHING_IN_FRONT(

            Flags::skipDeactivationOfDeskWithNothingInFront, true,

            Flags.FLAG_SKIP_DEACTIVATION_OF_DESK_WITH_NOTHING_IN_FRONT),

core/java/android/window/flags/lse_desktop_experience.aconfig

+2 −2
Original line number Diff line number Diff line
@@ -1777,9 +1777,9 @@ flag { 
}



flag {

    name: "show_biometric_prompt_secondary_display_toast"

    name: "show_biometric_prompt_secondary_display_message"

    namespace: "lse_desktop_experience"

    description: "Shows a toast on secondary screens to direct users to use their device to finish biometric authorization"

    description: "Shows a message on secondary screens to direct users to use their device to finish biometric authorization"

    bug: "419799860"

    metadata {

         purpose: PURPOSE_BUGFIX

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+1 −1
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ public class AuthController implements 
    }



    private void maybeShowSecondaryDisplayToast() {

        if (!DesktopExperienceFlags.SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_TOAST.isTrue()) return;

        if (!DesktopExperienceFlags.SHOW_BIOMETRIC_PROMPT_SECONDARY_DISPLAY_MESSAGE.isTrue()) return;

        int focusedDisplayId = mFocusedDisplayRepository.getFocusedDisplayId().getValue();

        if (focusedDisplayId != Display.DEFAULT_DISPLAY) {

            Display focusedDisplay = mDisplayManager.getDisplay(focusedDisplayId);