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

Commit e198ff26 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Modifying FingerprintSettingsV2 structure" into main

parents 4f510190 2e0244e3

AndroidManifest.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -2567,7 +2567,8 @@ 
            </intent-filter>

            </intent-filter>

        </activity>

        </activity>





        <activity android:name=".biometrics.fingerprint2.enrollment.ui.activity.FingerprintEnrollmentV2Activity"



        <activity android:name=".biometrics.fingerprint2.ui.enrollment.activity.FingerprintEnrollmentV2Activity"

            android:exported="true"

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"

            android:permission="android.permission.MANAGE_FINGERPRINT"

            android:theme="@style/GlifTheme.Light">

            android:theme="@style/GlifTheme.Light">
@@ -4942,7 +4943,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.biometrics.fingerprint2.ui.fragment.FingerprintSettingsV2Fragment" />

                android:value="com.android.settings.biometrics.fingerprint2.ui.settings.fragment.FingerprintSettingsV2Fragment" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_security"/>

                android:value="@string/menu_key_security"/>

        </activity>

        </activity>

src/com/android/settings/biometrics/fingerprint2/README.md

0 → 100644
+10 −0
Original line number Original line Diff line number Diff line 
### Fingerprint Settings Enrollment



#### Flows



* FingerprintSettings (ui.settings.fragment.FingerprintSettingsV2Fragment)

* FingerprintEnrollment (ui.enrollment.activity.FingerprintEnrollmentV2Activity)



#### Style



* Please use [kfmt](https://plugins.jetbrains.com/plugin/14912-ktfmt)
 
 No newline at end of file

src/com/android/settings/biometrics/fingerprint2/domain/interactor/FingerprintManagerInteractor.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,8 @@ import android.hardware.fingerprint.FingerprintSensorPropertiesInternal 
import android.os.CancellationSignal

import android.os.CancellationSignal

import android.util.Log

import android.util.Log

import com.android.settings.biometrics.GatekeeperPasswordProvider

import com.android.settings.biometrics.GatekeeperPasswordProvider

import com.android.settings.biometrics.fingerprint2.ui.viewmodel.FingerprintAuthAttemptViewModel

import com.android.settings.biometrics.fingerprint2.shared.model.FingerprintAuthAttemptViewModel

import com.android.settings.biometrics.fingerprint2.ui.viewmodel.FingerprintViewModel

import com.android.settings.biometrics.fingerprint2.shared.model.FingerprintViewModel

import com.android.settings.password.ChooseLockSettingsHelper

import com.android.settings.password.ChooseLockSettingsHelper

import kotlin.coroutines.resume

import kotlin.coroutines.resume

import kotlin.coroutines.suspendCoroutine

import kotlin.coroutines.suspendCoroutine

src/com/android/settings/biometrics/fingerprint2/ui/viewmodel/FingerprintViewModel.kt→src/com/android/settings/biometrics/fingerprint2/shared/model/FingerprintViewModel.kt

+4 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,9 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.settings.biometrics.fingerprint2.ui.viewmodel

package com.android.settings.biometrics.fingerprint2.shared.model



import android.hardware.fingerprint.FingerprintSensorPropertiesInternal





/** Represents the fingerprint data nad the relevant state. */

/** Represents the fingerprint data nad the relevant state. */

data class FingerprintStateViewModel(

data class FingerprintStateViewModel(
@@ -23,6 +25,7 @@ data class FingerprintStateViewModel( 
  val maxFingerprints: Int,

  val maxFingerprints: Int,

  val hasSideFps: Boolean,

  val hasSideFps: Boolean,

  val pressToAuth: Boolean,

  val pressToAuth: Boolean,

  val sensorProps: FingerprintSensorPropertiesInternal,

)

)





data class FingerprintViewModel(

data class FingerprintViewModel(

src/com/android/settings/biometrics/fingerprint2/ui/enrollment/README.md

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
### Fingerprint Settings Enrollment



#### Entry Points (To FingerprintEnrollment)



* FingerprintSettings (which launches the below intent)

* Intent -> ".biometrics.fingerprint2.ui.enrollment.activity.FingerprintEnrollmentV2Activity")



#### General Architecture



The code should follow the MVVM architecture.



**In addition, one activity (FingerprintEnrollmentV2Activity) should**



* Control a list of fragments which correspond to enrollment steps

* Be responsible for navigation events between fragments

* Be responsible for navigation events to other activities if need be (

  ConfirmDeviceCredentialActivity)

* Be the controller of the viewmodels



#### Style



* Please use [kfmt](https://plugins.jetbrains.com/plugin/14912-ktfmt)