diff --git a/res/values/lineage_config.xml b/res/values/lineage_config.xml index 5abcab98da9bebed72ab7c8734a33d9d205d7648..3fc65763a26092a565d97640feadab10aa168613 100644 --- a/res/values/lineage_config.xml +++ b/res/values/lineage_config.xml @@ -1,6 +1,6 @@ false + + false + com.android.localtransport/.LocalTransport diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 7cac184a5c6799c7b776a613c10e2d8362b2e858..242627261d17821ee1a497741ce89ae2797d4e07 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 87ce623f9b9427f7eeebb70b94b4d5c5636d2ac1..217b5e5f5ff310b81abe9290c3c2e50f280fe2ce 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);