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

Commit d8ad5a73 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9257771 from bc38baca to tm-qpr2-release 

Change-Id: Ie592c9b64452a233a37a8876c54fbe00aba22482
parents 112d8905 bc38baca

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ android_library { 
        "WifiTrackerLib",

        "SettingsLibActivityEmbedding",

        "Settings-change-ids",

        "SystemUIUnfoldLib",

    ],



    libs: [

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -2976,6 +2976,7 @@ 
                  android:taskAffinity="com.android.settings.FallbackHome"

                  android:exported="true"

                  android:theme="@style/FallbackHome"

                  android:permission="android.permission.DEVICE_POWER"

                  android:configChanges="keyboardHidden">

            <intent-filter android:priority="-1000">

                <action android:name="android.intent.action.MAIN" />

res/layout/sfps_enroll_finish_base.xml

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

        android:clipChildren="false">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:gravity="center"

            android:orientation="vertical">

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

                style="@style/SudSwitchStyle"

                android:id="@+id/require_screen_on_to_auth_toggle"

                android:layout_gravity="start"

                android:paddingLeft="0dp"

                android:paddingStart="0dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />



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

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

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

            </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>



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

res/layout/sfps_require_screen_on_to_auth_toggle.xml

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="start"

    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 -->

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

        android:id="@+id/title"

        android:paddingHorizontal="8dp"

        android:paddingTop="8dp"

        android:paddingBottom="4dp"

        android:gravity="start"

        android:layout_alignParentStart="true"

        android:layout_toStartOf="@+id/toggle"

        android:textAlignment="viewStart"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

    <TextView

        android:id="@+id/subtitle"

        android:paddingHorizontal="8dp"

        android:paddingBottom="8dp"

        android:layout_alignParentStart="true"

        android:textAlignment="viewStart"

        android:layout_toStartOf="@+id/toggle"

        android:layout_below="@+id/title"

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

        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 -->

    <Switch

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

        android:id="@+id/toggle"

        android:layout_centerVertical="true"

        android:checked="false"/>

        android:checked="false"

        style="@style/SudSwitchStyle"/>



</RelativeLayout>
 
 No newline at end of file

res/raw/fingerprint_edu_lottie.json

+1 −0

File changed.

Preview size limit exceeded, changes collapsed.