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

Commit 4615e3d8 authored Aug 14, 2023 by Austin Delgado Committed by Automerger Merge Worker Aug 14, 2023

Merge "Update BP strings" into udc-d1-dev am: b8318c47 am: b05416e7

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

Change-Id: I17b595b749ed406e56b189c4f5ebe82fb614acec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1ba8ee33 b05416e7

core/res/res/values/strings.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1837,6 +1837,8 @@
	<string name="fingerprint_error_not_match">Fingerprint not recognized</string>		<string name="fingerprint_error_not_match">Fingerprint not recognized</string>
	<!-- Message shown when UDFPS fails to match -->		<!-- Message shown when UDFPS fails to match -->
	<string name="fingerprint_udfps_error_not_match">Fingerprint not recognized</string>		<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] -->		<!-- Accessibility message announced when a fingerprint has been authenticated [CHAR LIMIT=NONE] -->
	<string name="fingerprint_authenticated">Fingerprint authenticated</string>		<string name="fingerprint_authenticated">Fingerprint authenticated</string>

core/res/res/values/symbols.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2598,6 +2598,7 @@
	<java-symbol type="string" name="fingerprint_error_vendor_unknown" />		<java-symbol type="string" name="fingerprint_error_vendor_unknown" />
	<java-symbol type="string" name="fingerprint_error_not_match" />		<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_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_partial" />
	<java-symbol type="string" name="fingerprint_acquired_insufficient" />		<java-symbol type="string" name="fingerprint_acquired_insufficient" />
	<java-symbol type="string" name="fingerprint_acquired_imager_dirty" />		<java-symbol type="string" name="fingerprint_acquired_imager_dirty" />

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1049,7 +1049,7 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
	final int userId = mCurrentDialogArgs.argi1;		final int userId = mCurrentDialogArgs.argi1;
	if (isFaceAuthEnrolled(userId) && isFingerprintEnrolled(userId)) {		if (isFaceAuthEnrolled(userId) && isFingerprintEnrolled(userId)) {
	messageRes = modality == TYPE_FACE		messageRes = modality == TYPE_FACE
	? R.string.biometric_face_not_recognized		? R.string.fingerprint_dialog_use_fingerprint_instead
	: R.string.fingerprint_error_not_match;		: R.string.fingerprint_error_not_match;
	} else {		} else {
	messageRes = R.string.biometric_not_recognized;		messageRes = R.string.biometric_not_recognized;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -504,7 +504,7 @@ private class Spaghetti(
	modalities.hasFaceAndFingerprint &&		modalities.hasFaceAndFingerprint &&
	(viewModel.fingerprintStartMode.first() != FingerprintStartMode.Pending) &&		(viewModel.fingerprintStartMode.first() != FingerprintStartMode.Pending) &&
	(authenticatedModality == BiometricModality.Face) ->		(authenticatedModality == BiometricModality.Face) ->
	R.string.biometric_dialog_tap_confirm_with_face		R.string.biometric_dialog_tap_confirm_with_face_alt_1
	else -> null		else -> null
	}		}

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

+1 −2

Original line number	Original line	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.flags.Flags;
	import com.android.systemui.keyguard.WakefulnessLifecycle;		import com.android.systemui.keyguard.WakefulnessLifecycle;
	import com.android.systemui.statusbar.CommandQueue;		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.DelayableExecutor;
	import com.android.systemui.util.concurrency.Execution;		import com.android.systemui.util.concurrency.Execution;
	import com.android.systemui.util.concurrency.FakeExecution;		import com.android.systemui.util.concurrency.FakeExecution;
	@@ -517,7 +516,7 @@ public class AuthControllerTest extends SysuiTestCase {

	assertThat(mModalityCaptor.getValue().intValue()).isEqualTo(modality);		assertThat(mModalityCaptor.getValue().intValue()).isEqualTo(modality);
	assertThat(mMessageCaptor.getValue()).isEqualTo(		assertThat(mMessageCaptor.getValue()).isEqualTo(
	mContext.getString(R.string.biometric_face_not_recognized));		mContext.getString(R.string.fingerprint_dialog_use_fingerprint_instead));
	}		}

	@Test		@Test