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

Commit ea74ce99 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge ""Forgot my password" to start profile in locked state."

parents 0c9f4e2a 04f783c7

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -1612,6 +1612,10 @@ 
            android:windowSoftInputMode="stateHidden|adjustResize"

            android:theme="@style/GlifTheme.Light"/>



        <activity android:name=".password.ForgotPasswordActivity"

            android:theme="@style/GlifV3Theme.Light"

            android:exported="false"/>



        <activity android:name=".biometrics.face.FaceEnrollIntroduction"

            android:exported="false"

            android:screenOrientation="portrait"/>

res/drawable/ic_help_outline_32.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

  <path

      android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"

      android:fillColor="?android:attr/colorPrimary"/>

</vector>

res/layout-land/confirm_lock_password.xml

+9 −0
Original line number Diff line number Diff line
@@ -54,6 +54,15 @@ 
                android:layout_height="wrap_content"

                android:layout_marginStart="?attr/sudMarginSides"

                android:layout_marginEnd="?attr/sudMarginSides" />



            <Button

                android:id="@+id/forgotButton"

                style="@style/SudGlifButton.Secondary"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="?attr/sudMarginSides"

                android:layout_marginEnd="?attr/sudMarginSides"

                android:layout_gravity="center" />

        </LinearLayout>



        <Space

res/layout-land/confirm_lock_pattern.xml

+9 −0
Original line number Diff line number Diff line
@@ -70,6 +70,15 @@ 
                    android:layout_marginEnd="?attr/sudMarginSides"

                    android:text="@string/cancel" />



                <Button

                    android:id="@+id/forgotButton"

                    style="@style/SudGlifButton.Secondary"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginSides"

                    android:layout_marginEnd="?attr/sudMarginSides"

                    android:layout_gravity="center" />



                <Space

                    android:layout_width="match_parent"

                    android:layout_height="0dp"

res/layout/confirm_lock_password_base.xml

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ 
                android:layout_height="wrap_content"

                android:layout_marginStart="?attr/sudMarginSides"

                android:layout_marginEnd="?attr/sudMarginSides" />



            <Button

                android:id="@+id/forgotButton"

                style="@style/SudGlifButton.Secondary"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="?attr/sudMarginSides"

                android:layout_marginEnd="?attr/sudMarginSides"

                android:layout_gravity="center" />

        </LinearLayout>



        <Space