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

Commit b8318c47 authored by Austin Delgado's avatar Austin Delgado Committed by Android (Google) Code Review
Browse files

Merge "Update BP strings" into udc-d1-dev

parents d97c8972 98cbf05b

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1835,6 +1835,8 @@ 
    <string name="fingerprint_error_not_match">Fingerprint not recognized</string>

    <!-- Message shown when UDFPS fails to match -->

    <string name="fingerprint_udfps_error_not_match">Fingerprint not recognized</string>

    <!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] -->

    <string name="fingerprint_dialog_use_fingerprint_instead">Can\u2019t recognize face. Use fingerprint instead.</string>



    <!-- Accessibility message announced when a fingerprint has been authenticated [CHAR LIMIT=NONE] -->

    <string name="fingerprint_authenticated">Fingerprint authenticated</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2591,6 +2591,7 @@ 
  <java-symbol type="string" name="fingerprint_error_vendor_unknown" />

  <java-symbol type="string" name="fingerprint_error_not_match" />

  <java-symbol type="string" name="fingerprint_udfps_error_not_match" />

  <java-symbol type="string" name="fingerprint_dialog_use_fingerprint_instead" />

  <java-symbol type="string" name="fingerprint_acquired_partial" />

  <java-symbol type="string" name="fingerprint_acquired_insufficient" />

  <java-symbol type="string" name="fingerprint_acquired_imager_dirty" />

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

+3 −2
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.concurrency.Execution;



import kotlin.Unit;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;
@@ -101,7 +103,6 @@ import java.util.Set; 
import javax.inject.Inject;

import javax.inject.Provider;



import kotlin.Unit;

import kotlinx.coroutines.CoroutineScope;



/**
@@ -1036,7 +1037,7 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
        final int userId = mCurrentDialogArgs.argi1;

        if (isFaceAuthEnrolled(userId) && isFingerprintEnrolled(userId)) {

            messageRes = modality == TYPE_FACE

                    ? R.string.biometric_face_not_recognized

                    ? R.string.fingerprint_dialog_use_fingerprint_instead

                    : R.string.fingerprint_error_not_match;

        } else {

            messageRes = R.string.biometric_not_recognized;

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ private class Spaghetti( 
            modalities.hasFaceAndFingerprint &&

                (viewModel.fingerprintStartMode.first() != FingerprintStartMode.Pending) &&

                (authenticatedModality == BiometricModality.Face) ->

                R.string.biometric_dialog_tap_confirm_with_face

                R.string.biometric_dialog_tap_confirm_with_face_alt_1

            else -> null

        }

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java

+1 −2
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ import com.android.systemui.flags.FakeFeatureFlags; 
import com.android.systemui.flags.Flags;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.concurrency.Execution;

import com.android.systemui.util.concurrency.FakeExecution;
@@ -515,7 +514,7 @@ public class AuthControllerTest extends SysuiTestCase { 


        assertThat(mModalityCaptor.getValue().intValue()).isEqualTo(modality);

        assertThat(mMessageCaptor.getValue()).isEqualTo(

                mContext.getString(R.string.biometric_face_not_recognized));

                mContext.getString(R.string.fingerprint_dialog_use_fingerprint_instead));

    }



    @Test