diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-08-07 11:49:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-07 11:49:15 -0700 |
| commit | f621435eafcb46f69b35b8a6b8119ab87801e9ef (patch) | |
| tree | 897e1dc4c4784dbd95caaf3f1c78d5ec4e7df1bb /res/xml | |
| parent | 9effd146114364c91d44b9a44ade761b69bdd1cf (diff) | |
| parent | 2d803a3931797891a30158c1a912ce775049f974 (diff) | |
| download | packages_apps_settings-f621435eafcb46f69b35b8a6b8119ab87801e9ef.zip packages_apps_settings-f621435eafcb46f69b35b8a6b8119ab87801e9ef.tar.gz packages_apps_settings-f621435eafcb46f69b35b8a6b8119ab87801e9ef.tar.bz2 | |
Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/development_prefs.xml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 202265c..e9a15be 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -18,8 +18,8 @@ android:title="@string/development_settings_title"> <com.android.settings.BugreportPreference android:key="bugreport" - android:title="@string/bugreport_title" - android:dialogTitle="@string/bugreport_title" /> + android:title="@*android:string/bugreport_title" + android:dialogTitle="@*android:string/bugreport_title" /> <PreferenceScreen android:key="local_backup_password" @@ -58,6 +58,11 @@ android:summary="@string/enable_adb_summary"/> <CheckBoxPreference + android:key="bugreport_in_power" + android:title="@string/bugreport_in_power" + android:summary="@string/bugreport_in_power_summary"/> + + <CheckBoxPreference android:key="allow_mock_location" android:title="@string/allow_mock_location" android:summary="@string/allow_mock_location_summary"/> |