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

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

Snap for 8903569 from 271a57d9 to tm-qpr1-release 

Change-Id: I038e02e5f2dc567bef321649d67e7a6223fef4ee
parents 81327543 271a57d9

res/layout/face_enroll_education.xml

+4 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
                android:layout_width="match_parent"

                android:layout_height="440dp"

                android:layout_marginTop="-52dp"

                android:scaleType="centerCrop"

                android:scaleType="centerInside"

                android:visibility="gone"

                app:lottie_autoPlay="true"

                app:lottie_loop="true"
@@ -66,7 +66,7 @@ 
                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:visibility="invisible"

                android:background="@drawable/face_enroll_icon_large"/>

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



        </FrameLayout>
@@ -83,7 +83,8 @@ 


            <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content">

                android:layout_height="wrap_content"

                android:layout_marginTop="-24dp">



                <Button

                    android:id="@+id/accessibility_button"

res/xml/dream_fragment_overview.xml

+13 −12
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 
        settings:controller="com.android.settings.dream.DreamMainSwitchPreferenceController"

        settings:searchable="false"/>



    <Preference

        android:key="when_to_start"

        android:title="@string/screensaver_settings_when_to_dream"

        android:fragment="com.android.settings.dream.WhenToDreamPicker"/>



    <PreferenceCategory

        android:title="@string/dream_picker_category">

        <com.android.settingslib.widget.LayoutPreference
@@ -36,17 +41,13 @@ 
            settings:controller="com.android.settings.dream.DreamPickerController"/>

    </PreferenceCategory>



    <PreferenceCategory

        android:title="@string/dream_more_settings_category">

    <SwitchPreference

        android:key="dream_complications_toggle"

        android:title="@string/dream_complications_toggle_title"

        android:summary="@string/dream_complications_toggle_summary"

        settings:controller="com.android.settings.dream.DreamComplicationPreferenceController"/>

        <Preference

            android:key="when_to_start"

            android:title="@string/screensaver_settings_when_to_dream"

            android:fragment="com.android.settings.dream.WhenToDreamPicker"/>

    </PreferenceCategory>



    <com.android.settings.applications.SpacePreference

        android:layout_height="16dp" />



</PreferenceScreen>