[Fingerprint] Add fingerprint enroll in setup wizard
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.
On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.
Bug: 21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8aac7d4..e80856d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1434,9 +1434,16 @@
<activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
<activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".fingerprint.FingerprintEnrollFinish" android:exported="false"/>
- <activity android:name=".fingerprint.FingerprintEnrollIntroduction"
+ <activity android:name=".fingerprint.FingerprintEnrollIntroduction" android:exported="false" />
+
+ <activity android:name=".fingerprint.SetupFingerprintEnrollOnboard" android:exported="false"/>
+ <activity android:name=".fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
+ <activity android:name=".fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
+ <activity android:name=".fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
+ <activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction"
android:exported="true"
- android:permission="android.permission.MANAGE_FINGERPRINT">
+ android:permission="android.permission.MANAGE_FINGERPRINT"
+ android:theme="@style/SetupWizardDisableAppStartingTheme">
<intent-filter>
<action android:name="android.settings.FINGERPRINT_SETUP" />
<category android:name="android.intent.category.DEFAULT" />