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

Commit 406b01f4 authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Add support for changing status widget on security screen" into jb-mr1-dev

parents e4f249bb 091477b4

res/values/strings.xml

+7 −1
Original line number Diff line number Diff line
@@ -794,12 +794,18 @@ 
    <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->

    <string name="unlock_set_unlock_launch_picker_title">Screen lock</string>



    <!--  Title for PreferenceScreen to launch picker for a user-selected time & data widget that will live on lock screen [CHAR LIMIT=22] -->

    <string name="choose_lockscreen_status_widget_picker_title">Status widget</string>



    <!--  Title for PreferenceScreen to launch picker for a user-selected widget that will live on lock screen [CHAR LIMIT=22] -->

    <string name="choose_user_selected_lockscreen_widget_picker_title">Widget</string>

    <string name="choose_user_selected_lockscreen_widget_picker_title">Other widget</string>



    <!--  String to display if there is no user-selected widget on lock screen [CHAR LIMIT=22] -->

    <string name="widget_none">None</string>



    <!--  String to display if the default status widget is selected [CHAR LIMIT=22] -->

    <string name="widget_default">Default</string>



    <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->

    <string name="unlock_set_unlock_launch_picker_change_title">Change lock screen</string>

res/xml/security_settings_biometric_weak.xml

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,18 @@ 
            android:summary="@string/unlock_set_unlock_mode_biometric_weak"

            android:persistent="false"/>



        <PreferenceScreen

           android:key="choose_lockscreen_status_widget"

           android:title="@string/choose_lockscreen_status_widget_picker_title"

           android:summary=""

           android:persistent="false"/>



        <PreferenceScreen

           android:key="choose_user_selected_lockscreen_widget"

           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"

           android:summary=""

           android:persistent="false"/>



        <PreferenceScreen

            android:key="biometric_weak_improve_matching"

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

res/xml/security_settings_chooser.xml

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ 
            android:summary="@string/unlock_set_unlock_mode_none"

            android:persistent="false"/>



        <PreferenceScreen

           android:key="choose_lockscreen_status_widget"

           android:title="@string/choose_lockscreen_status_widget_picker_title"

           android:summary=""

           android:persistent="false"/>



        <PreferenceScreen

           android:key="choose_user_selected_lockscreen_widget"

           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"

res/xml/security_settings_password.xml

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ 
            android:summary="@string/unlock_set_unlock_mode_password"

            android:persistent="false"/>



        <PreferenceScreen

           android:key="choose_lockscreen_status_widget"

           android:title="@string/choose_lockscreen_status_widget_picker_title"

           android:summary=""

           android:persistent="false"/>



        <PreferenceScreen

           android:key="choose_user_selected_lockscreen_widget"

           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"

res/xml/security_settings_pattern.xml

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ 
            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_mode_pattern"

            android:persistent="false"/>



        <PreferenceScreen

           android:key="choose_lockscreen_status_widget"

           android:title="@string/choose_lockscreen_status_widget_picker_title"

           android:summary=""

           android:persistent="false"/>



        <PreferenceScreen

           android:key="choose_user_selected_lockscreen_widget"

           android:title="@string/choose_user_selected_lockscreen_widget_picker_title"