commit 994bff003380014fbc06f1fe410ae20428b5e1ba
author Pechetty Sravani (xWF) <pechetty@google.com> Mon Sep 09 04:06:57 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 04:06:57 2024 +0000
tree dbb9decccbd643804d22fb791fb5b1d087177a35
parent e401ce51ec831e7047102c72e3f38f8443020de7

Revert "Customize Fingerprint enroll activities"

Revert submission 29139483-494-trampoline

Reason for revert: DroidMonitor created revert due to b/365453068.

Reverted changes: /q/submissionid:29139483-494-trampoline

Change-Id: Ie2ab22694e7128e10eb11bf29340023e2bfd1343

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eebef14..d988fea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2816,9 +2816,6 @@
         <activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/>
         <activity android:name=".biometrics.fingerprint.FingerprintEnrollParentalConsent" android:exported="false"/>
         <activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroduction"
-            android:exported="false"
-            android:theme="@style/GlifTheme.Light" />
-        <activity android:name=".biometrics.fingerprint.FingerprintEnroll"
             android:exported="true"
             android:theme="@style/GlifTheme.Light">
             <intent-filter>
@@ -2829,13 +2826,9 @@
         </activity>
 
         <activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroductionInternal"
-              android:exported="false"
-              android:theme="@style/GlifTheme.Light"
-              android:taskAffinity="com.android.settings.root" />
-        <activity android:name=".biometrics.fingerprint.FingerprintEnroll$InternalActivity"
-            android:exported="false"
-            android:theme="@style/GlifTheme.Light"
-            android:taskAffinity="com.android.settings.root" />
+                  android:exported="false"
+                  android:theme="@style/GlifTheme.Light"
+                  android:taskAffinity="com.android.settings.root" />
 
         <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor"
             android:exported="false"
@@ -2843,10 +2836,6 @@
         <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
         <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
         <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollIntroduction"
-            android:exported="false"
-            android:permission="android.permission.MANAGE_FINGERPRINT"
-            android:theme="@style/GlifTheme.Light" />
-        <activity android:name=".biometrics.fingerprint.FingerprintEnroll$SetupActivity"
             android:exported="true"
             android:permission="android.permission.MANAGE_FINGERPRINT"
             android:theme="@style/GlifTheme.Light">
@@ -2856,6 +2845,7 @@
             </intent-filter>
         </activity>
 
+
         <activity android:name=".biometrics.fingerprint2.ui.enrollment.activity.FingerprintEnrollmentV2Activity"
             android:exported="true"
             android:permission="android.permission.MANAGE_FINGERPRINT"