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

Commit 7e837fae authored by Justin McClain's avatar Justin McClain
Browse files

Remote authenticator enrollment navigation. 

This change adds an entry point for Remote Auth enrollment and
navigation through the flow.

Bug: b/293906345
Test: make RunSettingsRoboTests -j40
Change-Id: I9bc803e24c4181ed73a0ef90b171897c677e71d1
parent 0127c488

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ android_library { 
        "androidx.cardview_cardview",

        "androidx.compose.runtime_runtime-livedata",

        "androidx.activity_activity-ktx",

        "androidx.navigation_navigation-fragment-ktx",

        "androidx.navigation_navigation-ui-ktx",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.window_window",

AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -2610,6 +2610,18 @@ 


        <activity android:name=".biometrics.activeunlock.ActiveUnlockRequireBiometricSetup" android:exported="false"/>



        <activity android:name=".remoteauth.RemoteAuthActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.settings.REMOTE_AUTHENTICATOR_ENROLL" />

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

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

            </intent-filter>

        </activity>

        <activity android:name=".remoteauth.RemoteAuthActivityInternal"

                  android:exported="false"

                  android:taskAffinity="com.android.settings.root" />



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name=".password.ConfirmLockPattern$InternalActivity"

            android:exported="false"

res/layout/remote_auth_root.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2023 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License")

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



        http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->



<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:ignore="MergeRootFrame">



    <androidx.fragment.app.FragmentContainerView

        android:id="@+id/nav_host_fragment"

        android:name="androidx.navigation.fragment.NavHostFragment"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        app:defaultNavHost="true" />



</FrameLayout>
 
 No newline at end of file

res/navigation/remote_auth_navigation.xml

0 → 100644
+53 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2023 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License")

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



        http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->



<navigation xmlns:android="http://schemas.android.com/apk/res/android"

            xmlns:app="http://schemas.android.com/apk/res-auto"

            android:id="@+id/remote_auth_navigation">



    <fragment android:id="@+id/remote_auth_enroll_introduction_fragment"

              android:name="com.android.settings.remoteauth.introduction.RemoteAuthEnrollIntroduction"

              android:label="fragment_enroll_introduction">

        <action

            android:id="@+id/action_introduction_to_enrolling"

            app:destination="@id/remote_auth_enroll_enrolling_fragment"/>

    </fragment>



    <fragment android:id="@+id/remote_auth_enroll_enrolling_fragment"

              android:name="com.android.settings.remoteauth.enrolling.RemoteAuthEnrollEnrolling"

              android:label="fragment_enroll_enrolling">

        <action

            android:id="@+id/action_enrolling_to_finish"

            app:destination="@id/remote_auth_enroll_finish_fragment"/>

    </fragment>



    <fragment android:id="@+id/remote_auth_enroll_finish_fragment"

              android:name="com.android.settings.remoteauth.finish.RemoteAuthEnrollFinish"

              android:label="fragment_enroll_finish">

        <action

            android:id="@+id/action_finish_to_settings"

            app:destination="@id/remote_auth_settings_fragment"/>

    </fragment>



    <fragment android:id="@+id/remote_auth_settings_fragment"

              android:name="com.android.settings.remoteauth.settings.RemoteAuthSettings"

              android:label="fragment_settings">

        <action

            android:id="@+id/action_settings_to_introduction"

            app:destination="@id/remote_auth_enroll_introduction_fragment"/>

    </fragment>

</navigation>
 
 No newline at end of file

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -887,6 +887,10 @@ 
    <string name="security_settings_fingerprint_multiple_face_watch_preference_summary">Face, fingerprints, and <xliff:g id="watch" example="Dani's Watch">%s</xliff:g> added</string>









    <!-- RemoteAuth unlock enrollment and settings --><skip />









    <!-- Title shown for menu item that launches watch unlock settings. [CHAR LIMIT=40] -->









    <string name ="security_settings_remoteauth_preference_title">Remote Authenticator Unlock</string>









    <!-- Message shown in summary field when remote authenticator is set up. [CHAR LIMIT=40] -->









    <string name="security_settings_remoteauth_preference_summary">Watch added</string>









    <!-- Strings for RemoteAuth enroll introduction page -->









    <!-- Introduction title shown in remote enrollment to introduce the remote feature [CHAR LIMIT=29] -->









    <string name="security_settings_remoteauth_enroll_introduction_title">Set up your watch</string>