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

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

release-request-edd71ba9-6f93-47be-957d-774c9d43a2dc-for-git_oc-mr1-release-42... 

release-request-edd71ba9-6f93-47be-957d-774c9d43a2dc-for-git_oc-mr1-release-4281935 snap-temp-L68100000094184972

Change-Id: Ib0d0d11ffba55fd3f84ec4de28f2e6b286eb897f
parents f32281b7 f51b4a58

res/drawable-nodpi/fingerprint_enroll_introduction.png

0 → 100644
+31.8 KiB
Loading image diff...

res/layout/choose_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:layout_height="match_parent"

    android:icon="@drawable/ic_lock"

    settings:suwFooter="@layout/choose_lock_password_footer"

    settings:suwHeaderText="@string/lockpassword_choose_your_password_header">

    settings:suwHeaderText="@string/lockpassword_choose_your_screen_lock_header">



    <LinearLayout

        style="@style/SuwContentFrame"

res/layout/fingerprint_enroll_introduction.xml

+14 −0
Original line number Diff line number Diff line
@@ -45,6 +45,20 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



        <com.android.setupwizardlib.view.FillContentLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1">



            <ImageView

                style="@style/SuwContentIllustration"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:contentDescription="@null"

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



        </com.android.setupwizardlib.view.FillContentLayout>



    </LinearLayout>



</com.android.setupwizardlib.GlifLayout>

res/values/themes.xml

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
    <style name="GlifTheme" parent="SuwThemeGlif">

        <!-- For all Alert Dialogs -->

        <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>

        <item name="android:colorPrimary">@color/suw_color_accent_dark</item>

        <item name="android:windowBackground">?android:attr/colorBackground</item>

        <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>

        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
@@ -46,7 +45,6 @@ 
    <style name="GlifTheme.Light" parent="SuwThemeGlif.Light">

        <!-- For all Alert Dialogs -->

        <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>

        <item name="android:colorPrimary">@color/suw_color_accent_light</item>

        <item name="android:windowBackground">?android:attr/colorBackground</item>

        <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>

        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
@@ -66,7 +64,6 @@ 
    <style name="GlifV2Theme" parent="SuwThemeGlifV2">

        <!-- For all Alert Dialogs -->

        <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>

        <item name="android:colorPrimary">@color/suw_color_accent_dark</item>

        <item name="android:windowBackground">?android:attr/colorBackground</item>

        <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>

        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
@@ -87,7 +84,6 @@ 
    <style name="GlifV2Theme.Light" parent="SuwThemeGlifV2.Light">

        <!-- For all Alert Dialogs -->

        <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>

        <item name="android:colorPrimary">@color/suw_color_accent_light</item>

        <item name="android:windowBackground">?android:attr/colorBackground</item>

        <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>

        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>

res/xml/security_settings_password_sub.xml

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <com.android.settings.TimeoutListPreference

        android:key="lock_after_timeout"

        android:title="@string/lock_after_timeout"

        android:summary="@string/lock_after_timeout_summary"

        android:summary="@string/summary_placeholder"

        android:entries="@array/lock_after_timeout_entries"

        android:entryValues="@array/lock_after_timeout_values" />
@@ -32,7 +32,6 @@ 


    <com.android.settingslib.RestrictedPreference

        android:key="owner_info_settings"

        android:title="@string/owner_info_settings_title"

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

        android:title="@string/owner_info_settings_title" />



</PreferenceScreen>