am ca436417: am f6794f95: Merge "Add setting to disable keyguard widgets" into klp-dev

* commit 'ca436417875bacc337080a7066395ca1ca0b2492':
  Add setting to disable keyguard widgets
This commit is contained in:
Jim Miller
2013-08-26 15:09:38 -07:00
committed by Android Git Automerger
8 changed files with 52 additions and 0 deletions

View File

@@ -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] -->

View File

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

View File

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

View File

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

View File

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

View File

@@ -42,6 +42,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"

View File

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