summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorrich cannings <richc@google.com>2012-09-25 16:20:36 -0700
committerrich cannings <richc@google.com>2012-09-27 17:15:46 -0700
commitf04211443e9cae815ad89f821b6ec83ec2790c0c (patch)
tree9e67d43ae9a2262542951a55a355b189d4238ed2 /res/xml
parentf4b6a68215a0269837b73f134ff57cf150bc1d9c (diff)
downloadpackages_apps_settings-f04211443e9cae815ad89f821b6ec83ec2790c0c.zip
packages_apps_settings-f04211443e9cae815ad89f821b6ec83ec2790c0c.tar.gz
packages_apps_settings-f04211443e9cae815ad89f821b6ec83ec2790c0c.tar.bz2
Developer setting to skip Package Verification
Add a developer setting to skip package verification when installing over USB/ADB/ADT, but still perform package verification on all other installs. This change also fixes visibility issues. Namely, now all "Verify apps" related settings will disappear when Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE is 0. Bug: 7183252 Change-Id: I04cfc4f521d1ecb73df56b172cf29cbd84f53dad
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/development_prefs.xml5
-rw-r--r--res/xml/security_settings_misc.xml3
2 files changed, 7 insertions, 1 deletions
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 93388fc..8fdb03f 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -75,6 +75,11 @@
android:title="@string/wait_for_debugger"
android:summary="@string/wait_for_debugger_summary"/>
+ <CheckBoxPreference
+ android:key="verify_apps_over_usb"
+ android:title="@string/verify_apps_over_usb_title"
+ android:summary="@string/verify_apps_over_usb_summary"/>
+
</PreferenceCategory>
<PreferenceCategory android:key="debug_input_category"
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 41a84b9..b0313eb 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -37,7 +37,8 @@
android:persistent="false"/>
</PreferenceCategory>
- <PreferenceCategory android:title="@string/device_admin_title"
+ <PreferenceCategory android:key="device_admin_category"
+ android:title="@string/device_admin_title"
android:persistent="false">
<Preference android:title="@string/manage_device_admin"