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

Commit f6794f95 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Add setting to disable keyguard widgets" into klp-dev

parents 2a570787 ef3e701b

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -682,6 +682,10 @@ 
    <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>

    <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->

    <string name="owner_info_settings_title">Owner info</string>

    <!-- Text shown for title of settings checkbox to disable widgets [CHAR LIMIT=20]-->

    <string name="security_enable_widgets_title">Enable widgets</string>

    <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->

    <string name="security_enable_widgets_disabled_summary">Disabled by administrator</string>

    <!-- Text shown for summary of owner info setting [CHAR LIMIT=40]-->

    <string name="owner_info_settings_summary"></string>

    <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->

res/xml/security_settings_biometric_weak.xml

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

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



        <CheckBoxPreference

            android:key="keyguard_enable_widgets"

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



        <PreferenceScreen

            android:fragment="com.android.settings.OwnerInfoSettings"

            android:key="owner_info_settings"

res/xml/security_settings_chooser.xml

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

            android:persistent="false"/>



        <CheckBoxPreference

            android:key="keyguard_enable_widgets"

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



        <PreferenceScreen

            android:fragment="com.android.settings.OwnerInfoSettings"

            android:key="owner_info_settings"

res/xml/security_settings_lockscreen.xml

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

            android:summary="@string/unlock_set_unlock_mode_off"

            android:persistent="false"/>



        <CheckBoxPreference

            android:key="keyguard_enable_widgets"

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



        <PreferenceScreen

            android:fragment="com.android.settings.OwnerInfoSettings"

            android:key="owner_info_settings"

res/xml/security_settings_password.xml

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

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



        <CheckBoxPreference

            android:key="keyguard_enable_widgets"

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



        <PreferenceScreen

            android:fragment="com.android.settings.OwnerInfoSettings"

            android:key="owner_info_settings"