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

Commit cf1662dd authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-fda658d8-eecf-4c78-a2e9-e5093ca10451-for-git_oc-mr1-release-41... 

release-request-fda658d8-eecf-4c78-a2e9-e5093ca10451-for-git_oc-mr1-release-4165363 snap-temp-L49300000080728237

Change-Id: Id962bd3d8a87c8d698de019767cfc93e27f7b348
parents e8b6f6ae 15946156

res/layout-land/fingerprint_enroll_enrolling.xml

+87 −78
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
    android:layout="@layout/suw_glif_blank_template"

    style="?attr/fingerprint_layout_theme">



    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fillViewport="true">

        <LinearLayout

            style="@style/SuwContentFrame"

            android:layout_width="match_parent"
@@ -97,10 +101,12 @@ 


            </LinearLayout>



        <FrameLayout

            <LinearLayout

                android:layout_width="0dp"

                android:layout_weight="1"

            android:layout_height="match_parent">

                android:layout_height="match_parent"

                android:gravity="center"

                android:orientation="vertical">



                <include layout="@layout/fingerprint_enroll_enrolling_content"

                    android:layout_width="match_parent"
@@ -115,10 +121,13 @@ 
                    android:layout_marginBottom="16dp"

                    android:layout_gravity="center_horizontal|bottom"

                    android:accessibilityLiveRegion="polite"

                    android:gravity="center_horizontal"

                    android:paddingEnd="5dp"

                    android:paddingStart="5dp"

                    android:visibility="invisible"/>



        </FrameLayout>



            </LinearLayout>



        </LinearLayout>

    </ScrollView>

</com.android.setupwizardlib.GlifLayout>

res/layout/fingerprint_enroll_enrolling_base.xml

+5 −4
Original line number Diff line number Diff line
@@ -57,10 +57,12 @@ 


        </FrameLayout>



        <FrameLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1">

            android:layout_weight="1"

            android:gravity="center"

            android:orientation="vertical">



            <include layout="@layout/fingerprint_enroll_enrolling_content"

                android:layout_width="@dimen/fingerprint_progress_bar_max_size"
@@ -73,13 +75,12 @@ 
                android:id="@+id/error_text"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="24dp"

                android:layout_gravity="center_horizontal|bottom"

                android:accessibilityLiveRegion="polite"

                android:gravity="center"

                android:visibility="invisible"/>



        </FrameLayout>

        </LinearLayout>



    </LinearLayout>

res/layout/suggestion_condition_container.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
    style="@style/SuggestionConditionStyle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="8dp"

    android:paddingEnd="8dp"

    android:paddingStart="5dp"

    android:paddingEnd="5dp"

    android:paddingBottom="@dimen/dashboard_padding_bottom">



    <android.support.v7.widget.CardView

res/xml/display_settings.xml

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
        settings:widgetLayout="@null"

        settings:keywords="@string/keywords_display_night_display" />



    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->

    <SwitchPreference

        android:key="auto_brightness"

        android:title="@string/auto_brightness_title"
@@ -51,6 +52,7 @@ 
            android:targetClass="@string/config_wallpaper_picker_class" />

    </com.android.settingslib.RestrictedPreference>



    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->

    <com.android.settings.TimeoutListPreference

        android:key="screen_timeout"

        android:title="@string/screen_timeout"
@@ -82,6 +84,7 @@ 
        android:title="@string/screensaver_settings_title"

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



    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->

    <Preference

        android:key="ambient_display"

        android:title="@string/ambient_display_screen_title"

res/xml/power_usage_summary.xml

+8 −2
Original line number Diff line number Diff line
@@ -59,14 +59,14 @@ 
            android:title="@string/battery_percentage"

            android:summary="@string/battery_percentage_description"/>



        <!-- Cross-listed item, if you change this, also change it in ia_display_settings.xml -->

        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->

        <SwitchPreference

            android:key="auto_brightness_battery"

            android:title="@string/auto_brightness_title"

            android:summary="@string/auto_brightness_summary"

            settings:keywords="@string/keywords_display_auto_brightness"/>



        <!-- Cross-listed item, if you change this, also change it in ia_display_settings.xml -->

        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->

        <com.android.settings.TimeoutListPreference

            android:key="screen_timeout_battery"

            android:title="@string/screen_timeout"
@@ -74,6 +74,12 @@ 
            android:entries="@array/screen_timeout_entries"

            android:entryValues="@array/screen_timeout_values"/>



        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->

        <Preference

            android:key="ambient_display_battery"

            android:title="@string/ambient_display_screen_title"

            android:fragment="com.android.settings.display.AmbientDisplaySettings" />



    </PreferenceCategory>



    <PreferenceCategory