Merge "Developer setting to skip Package Verification" into jb-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
4f64951cb8
@@ -2995,6 +2995,10 @@
|
||||
<string name="dev_settings_warning_title">Allow development settings?</string>
|
||||
<!-- Warning text to user about the implications of enabling USB debugging -->
|
||||
<string name="dev_settings_warning_message">These settings are intended for development use only. They can cause your device and the applications on it to break or misbehave.</string>
|
||||
<!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
|
||||
<string name="verify_apps_over_usb_title">Verify apps over USB</string>
|
||||
<!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
|
||||
<string name="verify_apps_over_usb_summary">Check apps installed via ADB/ADT for harmful behavior.</string>
|
||||
|
||||
<!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
|
||||
<string name="enforce_read_external_title" product="nosdcard">Protect USB storage</string>
|
||||
|
@@ -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"
|
||||
|
@@ -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"
|
||||
|
Reference in New Issue
Block a user