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

Commit d92faeb1 authored by Joshua McCloskey's avatar Joshua McCloskey
Browse files

Adding more biometric screenshot tests 

Test: atest FingerprintEnrollIntroScreenshotTest FingerprintEnrollFindSensorScreenshotTest FingerprintEnrollEnrollingScreenshotTest
Bug: 297083009
Change-Id: I11df6fbaefa9d333dcfe803577947a4be7af9882
parent 98374376

res/layout/fingerprint_enroll_find_sensor_graphic.xml

+4 −4
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"

        android:src="@drawable/fingerprint_sensor_location"

        android:scaleType="centerInside"/>

        android:scaleType="centerInside"

        android:src="@drawable/fingerprint_sensor_location" />



    <com.android.settings.biometrics.fingerprint.FingerprintLocationAnimationView

        android:id="@+id/fingerprint_sensor_location_animation"

res/layout/fingerprint_v2_enroll_find_sensor.xml

+22 −21
Original line number Diff line number Diff line
@@ -23,11 +23,12 @@ android:layout_width="match_parent" 
    android:layout_height="match_parent">



    <LinearLayout

        android:id="@+id/content_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

    android:orientation="vertical"

        android:clipChildren="false"

        android:clipToPadding="false"

    android:clipChildren="false">

        android:orientation="vertical">



        <Space

            android:layout_width="wrap_content"

res/layout/fingerprint_v2_rfps_enroll_enrolling.xml

+33 −32
Original line number Diff line number Diff line
@@ -18,14 +18,15 @@ 
<com.google.android.setupdesign.GlifLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    style="?attr/fingerprint_layout_theme"

    android:id="@+id/setup_wizard_layout"

    style="?attr/fingerprint_layout_theme"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    >



    <LinearLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/content_view"

        style="@style/SudContentFrame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -46,7 +47,6 @@ 
                android:layout_marginVertical="24dp"

                android:paddingTop="0dp"

                android:paddingBottom="0dp">



            <com.android.settings.biometrics.fingerprint2.ui.enrollment.modules.enrolling.rfps.ui.widget.RFPSProgressBar

                xmlns:android="http://schemas.android.com/apk/res/android"

                android:id="@+id/fingerprint_progress_bar"
@@ -54,7 +54,8 @@ 
                android:layout_height="match_parent"

                android:background="@drawable/fp_illustration"

                android:minHeight="@dimen/fingerprint_progress_bar_min_size"

                android:progress="0" />

                android:progress="0"

                    />



            </com.google.android.setupdesign.view.FillContentLayout>

src/com/android/settings/biometrics/fingerprint2/OWNERS

+2 −1
Original line number Diff line number Diff line 
# Owners for Biometric Fingerprint

joshmccloskey@google.com

jbolinger@google.com

spdonghao@google.com
 
 No newline at end of file

src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintSensorRepo.kt→src/com/android/settings/biometrics/fingerprint2/data/repository/FingerprintSensorRepository.kt

+3 −3
Original line number Diff line number Diff line
@@ -39,16 +39,16 @@ import kotlinx.coroutines.withContext 
 *

 * TODO(b/313493336): Move this to systemui

 */

interface FingerprintSensorRepo {

interface FingerprintSensorRepository {

  /** Get the [FingerprintSensor] */

  val fingerprintSensor: Flow<FingerprintSensor>

}



class FingerprintSensorRepoImpl(

class FingerprintSensorRepositoryImpl(

    fingerprintManager: FingerprintManager,

    backgroundDispatcher: CoroutineDispatcher,

    activityScope: CoroutineScope,

) : FingerprintSensorRepo {

) : FingerprintSensorRepository {



  override val fingerprintSensor: Flow<FingerprintSensor> =

    callbackFlow {