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

Commit 7b58cadc authored by Joshua McCloskey's avatar Joshua McCloskey
Browse files

Updated sfps screen auth toggle. 

Test: Verified toggle is on top of icon during fingerprint setup.
Fixes: 254923267
Change-Id: Id2f6444646201b6e4eca0c563984527776227ebb
parent 2552ae08

res/layout/sfps_enroll_finish_base.xml

+9 −22
Original line number Original line Diff line number Diff line
@@ -30,12 +30,14 @@ 
        android:clipToPadding="false"

        android:clipToPadding="false"

        android:clipChildren="false">

        android:clipChildren="false">





        <LinearLayout

            <com.android.settings.biometrics.fingerprint.FingerprintRequireScreenOnToAuthToggle

            android:layout_width="match_parent"

                style="@style/SudSwitchStyle"

            android:layout_height="0dp"

                android:id="@+id/require_screen_on_to_auth_toggle"

            android:layout_weight="1"

                android:layout_gravity="start"

            android:gravity="center"

                android:paddingLeft="0dp"

            android:orientation="vertical">

                android:paddingStart="0dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />





            <com.google.android.setupdesign.view.FillContentLayout

            <com.google.android.setupdesign.view.FillContentLayout

                android:layout_width="@dimen/sfps_enrollment_finished_icon_max_size"

                android:layout_width="@dimen/sfps_enrollment_finished_icon_max_size"
@@ -54,21 +56,6 @@ 
                    android:importantForAccessibility="no"

                    android:importantForAccessibility="no"

                    android:src="@drawable/sfps_enroll_finish" />

                    android:src="@drawable/sfps_enroll_finish" />

            </com.google.android.setupdesign.view.FillContentLayout>

            </com.google.android.setupdesign.view.FillContentLayout>



            <Space

                android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="1" />



            <com.android.settings.biometrics.fingerprint.FingerprintRequireScreenOnToAuthToggle

                style="@style/SudSwitchStyle"

                android:id="@+id/require_screen_on_to_auth_toggle"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal|bottom" />



        </LinearLayout>



    </LinearLayout>

    </LinearLayout>





</com.google.android.setupdesign.GlifLayout>
 
</com.google.android.setupdesign.GlifLayout>

res/layout/sfps_require_screen_on_to_auth_toggle.xml

+5 −22
Original line number Original line Diff line number Diff line
@@ -19,24 +19,16 @@ 
    android:orientation="vertical"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="start"

    style="?attr/fingerprint_layout_theme">

    style="?attr/fingerprint_layout_theme">





    <!-- Top divider -->

    <View

        android:layout_alignParentTop="true"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="?android:attr/listDivider" />



    <!-- Title -->

    <!-- Title -->

    <com.google.android.setupdesign.view.RichTextView

    <com.google.android.setupdesign.view.RichTextView

        android:id="@+id/title"

        android:id="@+id/title"

        android:paddingHorizontal="8dp"

        android:paddingTop="8dp"

        android:paddingTop="8dp"

        android:paddingBottom="4dp"

        android:paddingBottom="4dp"

        android:gravity="start"

        android:layout_alignParentStart="true"

        android:layout_alignParentStart="true"

        android:layout_toStartOf="@+id/toggle"

        android:textAlignment="viewStart"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/security_settings_require_screen_on_to_auth_title"

        android:text="@string/security_settings_require_screen_on_to_auth_title"
@@ -47,9 +39,9 @@ 
    <!-- Subtitle -->

    <!-- Subtitle -->

    <TextView

    <TextView

        android:id="@+id/subtitle"

        android:id="@+id/subtitle"

        android:paddingHorizontal="8dp"

        android:paddingBottom="8dp"

        android:paddingBottom="8dp"

        android:layout_alignParentStart="true"

        android:layout_alignParentStart="true"

        android:textAlignment="viewStart"

        android:layout_toStartOf="@+id/toggle"

        android:layout_toStartOf="@+id/toggle"

        android:layout_below="@+id/title"

        android:layout_below="@+id/title"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"
@@ -57,16 +49,6 @@ 
        android:text="@string/security_settings_require_screen_on_to_auth_description"

        android:text="@string/security_settings_require_screen_on_to_auth_description"

        android:textColor="?android:attr/textColorSecondary"/>

        android:textColor="?android:attr/textColorSecondary"/>





    <!-- Vertical divider -->

    <View

        android:layout_centerVertical="true"

        android:layout_alignTop="@+id/toggle"

        android:layout_alignBottom="@+id/toggle"

        android:layout_toStartOf="@+id/toggle"

        android:layout_width="1dp"

        android:layout_height="wrap_content"

        android:background="?android:attr/listDivider" />



    <!-- Toggle -->

    <!-- Toggle -->

    <Switch

    <Switch

        android:layout_alignParentEnd="true"

        android:layout_alignParentEnd="true"
@@ -74,6 +56,7 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/toggle"

        android:id="@+id/toggle"

        android:layout_centerVertical="true"

        android:layout_centerVertical="true"

        android:checked="false"/>

        android:checked="false"

        style="@style/SudSwitchStyle"/>





</RelativeLayout>
 
</RelativeLayout>
 
 No newline at end of file