commit bc2dbee7621cc07a99f6eccd0197b36aaa4794c7
author Milton Wu <mingjuwu@google.com> Wed May 24 16:23:55 2023 +0800
committer Milton Wu <mingjuwu@google.com> Thu May 25 06:25:58 2023 +0000
tree 41c6c17226ed6bbc0fa939e312a7fc26127369de
parent 7cbd01357a4d7bcfb1d02836ed3191b5b0e92e29

[BiometricsV2] Refine fingerprint activities

Seperate FingerprintEnrollmentActivity to another InternalActivity and
SetupActivity. InternalActivity is used for FingerprintSettings.
SetupActivity is used for setupwizard flow.

Bug: 284248001
Test: atest FingerprintEnrollmentActivityTest
Test: atest for biometrics/biometrics2 in unit tests
Test: settingRoboTest for biometrics
Change-Id: I9fb5dc34300060b9ccf857a3335b81a5d4bf5c7b

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6fcaf71..d1af75d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2529,8 +2529,17 @@
 
         <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity"
             android:exported="true"
+            android:theme="@style/GlifTheme.Light" />
+
+        <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity$InternalActivity"
+            android:exported="false"
+            android:theme="@style/GlifTheme.Light"
+            android:taskAffinity="com.android.settings.root" />
+
+        <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity$SetupActivity"
+            android:exported="true"
             android:permission="android.permission.MANAGE_FINGERPRINT"
-            android:theme="@style/GlifTheme.Light"/>
+            android:theme="@style/GlifTheme.Light" />
 
         <activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroductionInternal"
                   android:exported="false"