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

Commit 130bd718 authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "Refine biometric dangling notification" into 24D1-dev am: 3c2f0a5e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27374918



Change-Id: I61d88fc3b80b8efdd49dc5dd2b9cdb32af1baa1c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc31eba9 3c2f0a5e

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -6491,9 +6491,9 @@ ul.</string> 
    <!-- Fingerprint dangling notification title -->

    <string name="fingerprint_dangling_notification_title">Set up Fingerprint Unlock again</string>

    <!-- Fingerprint dangling notification content for only 1 fingerprint deleted -->

    <string name="fingerprint_dangling_notification_msg_1"><xliff:g id="fingerprint">%s</xliff:g> wasn\'t working well and was deleted to improve performance</string>

    <string name="fingerprint_dangling_notification_msg_1"><xliff:g id="fingerprint">%s</xliff:g> wasn\'t working well and was deleted</string>

    <!-- Fingerprint dangling notification content for more than 1 fingerprints deleted -->

    <string name="fingerprint_dangling_notification_msg_2"><xliff:g id="fingerprint">%1$s</xliff:g> and <xliff:g id="fingerprint">%2$s</xliff:g> weren\'t working well and were deleted to improve performance</string>

    <string name="fingerprint_dangling_notification_msg_2"><xliff:g id="fingerprint">%1$s</xliff:g> and <xliff:g id="fingerprint">%2$s</xliff:g> weren\'t working well and were deleted</string>

    <!-- Fingerprint dangling notification content for only 1 fingerprint deleted and no fingerprint left-->

    <string name="fingerprint_dangling_notification_msg_all_deleted_1"><xliff:g id="fingerprint">%s</xliff:g> wasn\'t working well and was deleted. Set it up again to unlock your phone with fingerprint.</string>

    <!-- Fingerprint dangling notification content for more than 1 fingerprints deleted and no fingerprint left  -->

services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java

+6 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public class BiometricNotificationUtils { 


        showNotificationHelper(context, name, title, content, setupPendingIntent, setupAction,

                notNowAction, Notification.CATEGORY_SYSTEM, channel, tag,

                Notification.VISIBILITY_SECRET, false);

                Notification.VISIBILITY_SECRET, false, Notification.FLAG_NO_CLEAR);

    }



    private static String getFingerprintDanglingContentString(Context context,
@@ -296,13 +296,13 @@ public class BiometricNotificationUtils { 
            String notificationTag, int visibility, boolean listenToDismissEvent) {

        showNotificationHelper(context, name, title, content, pendingIntent,

                null /* positiveAction */, null /* negativeAction */, category, channelName,

                notificationTag, visibility, listenToDismissEvent);

                notificationTag, visibility, listenToDismissEvent, 0);

    }



    private static void showNotificationHelper(Context context, String name, String title,

            String content, PendingIntent pendingIntent, Notification.Action positiveAction,

            Notification.Action negativeAction, String category, String channelName,

            String notificationTag, int visibility, boolean listenToDismissEvent) {

            String notificationTag, int visibility, boolean listenToDismissEvent, int flags) {

        Slog.v(TAG," listenToDismissEvent = " + listenToDismissEvent);

        final PendingIntent dismissIntent = PendingIntent.getActivityAsUser(context,

                0 /* requestCode */, DISMISS_FRR_INTENT, PendingIntent.FLAG_IMMUTABLE /* flags */,
@@ -324,6 +324,9 @@ public class BiometricNotificationUtils { 
                .setContentIntent(pendingIntent)

                .setVisibility(visibility);



        if (flags > 0) {

            builder.setFlag(flags, true);

        }

        if (positiveAction != null) {

            builder.addAction(positiveAction);

        }