From b7bc5bce77b213693b78d32eff30e13baca7067e Mon Sep 17 00:00:00 2001
From: Curtis Belmonte <curtislb@google.com>
Date: Thu, 25 Feb 2021 15:53:09 -0800
Subject: [PATCH] Tweak strings for traffic light face enrollment

Makes the following changes to help messages that will be shown during
traffic light face enrollment:
- Swaps messages for FACE_ACQUIRED_TOO_HIGH and FACE_ACQUIRED_TOO_LOW.
- Changes FACE_ACQUIRED_TILT_TOO_EXTREME message from "turn" to "tilt".

Test: Manually tested traffic light enrollment.

Bug: 179044580
Change-Id: I729cc1ac1909f3181b88d869358a4e9deb6761fd
---
 core/java/android/hardware/face/FaceManager.java | 12 ++++++++----
 core/res/res/values/strings.xml                  |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/java/android/hardware/face/FaceManager.java b/core/java/android/hardware/face/FaceManager.java
index f868a5066c253..0256b7bc6de03 100644
--- a/core/java/android/hardware/face/FaceManager.java
+++ b/core/java/android/hardware/face/FaceManager.java
@@ -1448,13 +1448,17 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
             case FACE_ACQUIRED_TOO_FAR:
                 return context.getString(R.string.face_acquired_too_far);
             case FACE_ACQUIRED_TOO_HIGH:
-                return context.getString(R.string.face_acquired_too_high);
-            case FACE_ACQUIRED_TOO_LOW:
+                // TODO(b/181269243): Change back once error codes are fixed.
                 return context.getString(R.string.face_acquired_too_low);
+            case FACE_ACQUIRED_TOO_LOW:
+                // TODO(b/181269243) Change back once error codes are fixed.
+                return context.getString(R.string.face_acquired_too_high);
             case FACE_ACQUIRED_TOO_RIGHT:
-                return context.getString(R.string.face_acquired_too_right);
-            case FACE_ACQUIRED_TOO_LEFT:
+                // TODO(b/181269243) Change back once error codes are fixed.
                 return context.getString(R.string.face_acquired_too_left);
+            case FACE_ACQUIRED_TOO_LEFT:
+                // TODO(b/181269243) Change back once error codes are fixed.
+                return context.getString(R.string.face_acquired_too_right);
             case FACE_ACQUIRED_POOR_GAZE:
                 return context.getString(R.string.face_acquired_poor_gaze);
             case FACE_ACQUIRED_NOT_DETECTED:
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 3505dee134c06..306fafd11f312 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1644,7 +1644,7 @@
     <!-- Message shown during acqusition when the user's face is turned too far left or right [CHAR LIMIT=50] -->
     <string name="face_acquired_pan_too_extreme">Turn your head a little less.</string>
     <!-- Message shown during acqusition when the user's face is tilted too high or too low [CHAR LIMIT=50] -->
-    <string name="face_acquired_tilt_too_extreme">Turn your head a little less.</string>
+    <string name="face_acquired_tilt_too_extreme">Tilt your head a little less.</string>
     <!-- Message shown during acquisiton when the user's face is tilted too far left or right [CHAR LIMIT=50] -->
     <string name="face_acquired_roll_too_extreme">Turn your head a little less.</string>
     <!-- Message shown during acquisition when the user's face is obscured [CHAR LIMIT=50] -->