diff options
| author | Jim Miller <jaggies@google.com> | 2010-11-30 19:47:38 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2010-11-30 20:21:42 -0800 |
| commit | 36972bb7e952ca8a7bd8e57e32246d60873d7479 (patch) | |
| tree | aabf4e40d61af4e29d713fef773e431c8b336c6e /res/xml/security_settings_chooser.xml | |
| parent | 382828175096a0300d49b9ce18ef600c223f43fd (diff) | |
| download | packages_apps_Settings-36972bb7e952ca8a7bd8e57e32246d60873d7479.zip packages_apps_Settings-36972bb7e952ca8a7bd8e57e32246d60873d7479.tar.gz packages_apps_Settings-36972bb7e952ca8a7bd8e57e32246d60873d7479.tar.bz2 | |
Fix 3201870: Move OwnerInfo settings to Location&Security.
This moves OwnerInfo into Location&Security and adds the
necessary logic to only show it in modes that make sense-
Lock (when not disabled) and Unlock (pattern, pin, password).
Change-Id: I3549dc4d956406aea3d63cd06d37bcea27a5b555
Diffstat (limited to 'res/xml/security_settings_chooser.xml')
| -rw-r--r-- | res/xml/security_settings_chooser.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml index 095c69f..7b5d9c9 100644 --- a/res/xml/security_settings_chooser.xml +++ b/res/xml/security_settings_chooser.xml @@ -26,6 +26,12 @@ android:summary="@string/unlock_set_unlock_launch_picker_summary" android:persistent="false"/> + <PreferenceScreen + android:fragment="com.android.settings.OwnerInfoSettings" + android:key="owner_info_settings" + android:title="@string/owner_info_settings_title" + android:summary="@string/owner_info_settings_summary"/> + </PreferenceCategory> </PreferenceScreen> |