summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-07-13 17:54:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-13 17:54:45 -0700
commit98f5024f2f5b538f09796179f419ffe2ac4dc418 (patch)
treee48cb7ccc487f0373066c8290473846c480cab49 /res/xml
parent03557f85901dd4c42be3a5283bafcf08e3239cf7 (diff)
parentb2a16b9202f6daa609d152ffc2fd273088fbb1ac (diff)
downloadpackages_apps_settings-98f5024f2f5b538f09796179f419ffe2ac4dc418.zip
packages_apps_settings-98f5024f2f5b538f09796179f419ffe2ac4dc418.tar.gz
packages_apps_settings-98f5024f2f5b538f09796179f419ffe2ac4dc418.tar.bz2
am b2a16b92: am ea819b07: Merge "Implement issue #6819955: Add button to take bug report." into jb-dev
* commit 'b2a16b9202f6daa609d152ffc2fd273088fbb1ac': Implement issue #6819955: Add button to take bug report.
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/development_prefs.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 6cb8238..47e58da 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -16,6 +16,11 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/development_settings_title">
+ <com.android.settings.BugreportPreference
+ android:key="bugreport"
+ android:title="@string/bugreport_title"
+ android:dialogTitle="@string/bugreport_title" />
+
<PreferenceScreen
android:key="local_backup_password"
android:title="@string/local_backup_password_title"