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

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

Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev

parents ed49b6fc 89a30ffc

res/values/strings.xml

+1 −4
Original line number Diff line number Diff line
@@ -808,11 +808,8 @@ 
    <!--  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">Other widget</string>

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



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

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

res/xml/security_settings_biometric_weak.xml

+0 −6
Original line number Diff line number Diff line
@@ -51,12 +51,6 @@ 
            android:key="power_button_instantly_locks"

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



        <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_chooser.xml

+0 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ 
            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

+0 −6
Original line number Diff line number Diff line
@@ -38,12 +38,6 @@ 
            android:key="power_button_instantly_locks"

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



        <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

+0 −6
Original line number Diff line number Diff line
@@ -42,12 +42,6 @@ 
            android:key="power_button_instantly_locks"

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



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