From 62f454ea3a291d327c5cf7517b72b45efb15fc8a Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Tue, 18 Apr 2023 16:16:34 +0100
Subject: [PATCH] FingerprintEnroll: Add config for dedicated side mounted fps

Google likes to assume that there only exists devices with
fingerprint sensor embedded in the power button, but that's
not always true.

[merothh]: Backport to A12

Change-Id: I56a7d7fe0374fe5a1fce5e24bdbb265cb5edc246
---
 res/values/lineage_config.xml                               | 6 +++++-
 .../biometrics/fingerprint/FingerprintEnrollEnrolling.java  | 4 +++-
 .../biometrics/fingerprint/FingerprintEnrollFindSensor.java | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/res/values/lineage_config.xml b/res/values/lineage_config.xml
index 5abcab98da9..3fc65763a26 100644
--- a/res/values/lineage_config.xml
+++ b/res/values/lineage_config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2020-2022 The LineageOS Project
+     Copyright (C) 2020-2023 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -18,6 +18,10 @@
     <!-- Indicates whether device has a front facing fingerprint sensor (not udfps). -->
     <bool name="config_is_front_facing_fps" translatable="false">false</bool>
 
+    <!-- Indicates whether device has a side mounted fingerprint sensor,
+         but a dedicated one, i.e. not embedded in the power button. -->
+    <bool name="config_is_side_fps" translatable="false">false</bool>
+
     <string-array name="config_ignored_backup_transports" translatable="false">
         <item>com.android.localtransport/.LocalTransport</item>
     </string-array>
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 7cac184a5c6..242627261d1 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -743,7 +743,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final boolean isFrontFacingFps = getResources().getBoolean(
                     R.bool.config_is_front_facing_fps);
-            final String fpsLocation = getString(sCanAssumeSidefps
+            final boolean isSideMountedfps = sCanAssumeSidefps || getResources().getBoolean(
+                    R.bool.config_is_side_fps);
+            final String fpsLocation = getString(isSideMountedfps
                     ? R.string.fingerprint_enroll_touch_dialog_message_side : isFrontFacingFps
                             ? R.string.fingerprint_enroll_touch_dialog_message_front
                             : R.string.fingerprint_enroll_touch_dialog_message_rear);
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 87ce623f9b9..217b5e5f5ff 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -95,7 +95,9 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
         } else {
             final boolean isFrontFacingFps = getResources().getBoolean(
                     R.bool.config_is_front_facing_fps);
-            final String fpsLocation = getString(mCanAssumeSidefps
+            final boolean isSideMountedFps = mCanAssumeSidefps || getResources().getBoolean(
+                    R.bool.config_is_side_fps);
+            final String fpsLocation = getString(isSideMountedFps
                     ? R.string.fingerprint_enroll_find_sensor_message_side : isFrontFacingFps
                             ? R.string.fingerprint_enroll_find_sensor_message_front
                             : R.string.fingerprint_enroll_find_sensor_message_rear);
-- 
GitLab