diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-13 14:57:13 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-06-13 14:57:13 -0700 |
| commit | 6b5bcd213852a3fbff3ec427176862bc9b97e97f (patch) | |
| tree | 3ba2be89131ad4b93ef5d9d5bc7249d75088ea13 /res/xml/development_prefs.xml | |
| parent | a6fa002315c58ec4fd779ad27c4dacbcd631d980 (diff) | |
| parent | c2c64a312a0ccec59c13ee0d04b8ffc730b7a3b7 (diff) | |
| download | packages_apps_Settings-6b5bcd213852a3fbff3ec427176862bc9b97e97f.zip packages_apps_Settings-6b5bcd213852a3fbff3ec427176862bc9b97e97f.tar.gz packages_apps_Settings-6b5bcd213852a3fbff3ec427176862bc9b97e97f.tar.bz2 | |
resolved conflicts for merge of c2c64a31 to master
Change-Id: Ica0f138d4bf2cf66b8ba485bf286e062be433d0a
Diffstat (limited to 'res/xml/development_prefs.xml')
| -rw-r--r-- | res/xml/development_prefs.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index d435371..f0b17f9 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -111,6 +111,13 @@ android:title="@string/wifi_verbose_logging" /> android:summary="@string/wifi_verbose_logging_summary"/> + <ListPreference + android:key="select_logd_size" + android:title="@string/select_logd_size_title" + android:dialogTitle="@string/select_logd_size_dialog_title" + android:entries="@array/select_logd_size_titles" + android:entryValues="@array/select_logd_size_values" /> + </PreferenceCategory> <PreferenceCategory android:key="debug_input_category" |