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

Commit 8d1f9c9b authored by Maurice Lam's avatar Maurice Lam
Browse files

[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
parent e1eaed07

AndroidManifest.xml

+9 −2
Original line number Diff line number Diff line
@@ -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" />

res/layout-land/fingerprint_enroll_enrolling.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    style="@style/SetupWizardFingerprintStyle">

    style="?attr/fingerprint_layout_theme">



    <LinearLayout

        style="@style/SuwContentFrame"

res/layout-land/fingerprint_enroll_find_sensor.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    style="@style/SetupWizardFingerprintStyle">

    style="?attr/fingerprint_layout_theme">



    <LinearLayout

        style="@style/SuwContentFrame"

res/layout-land/fingerprint_enroll_finish.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    style="@style/SetupWizardFingerprintStyle">

    style="?attr/fingerprint_layout_theme">



    <LinearLayout

        style="@style/SuwContentFrame"

res/layout/fingerprint_enroll_enrolling_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    style="@style/SetupWizardFingerprintStyle">

    style="?attr/fingerprint_layout_theme">



    <LinearLayout

        style="@style/SuwContentFrame"