diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-03-24 19:08:43 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-03-24 19:08:43 -0700 |
| commit | 77eb8880e85db8c353b09e449e7df5f76f78216a (patch) | |
| tree | a392862352530c578c14a325300e32b008340f56 /res/xml/development_prefs.xml | |
| parent | a45047928532c0a50205237f294c561815f4f63b (diff) | |
| parent | c9d68e97e48426d560690ae4dc1ca076db388eb1 (diff) | |
| download | packages_apps_Settings-77eb8880e85db8c353b09e449e7df5f76f78216a.zip packages_apps_Settings-77eb8880e85db8c353b09e449e7df5f76f78216a.tar.gz packages_apps_Settings-77eb8880e85db8c353b09e449e7df5f76f78216a.tar.bz2 | |
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
Fix build in DevelopmentSettings.java
Change-Id: I8d89fd46482fae8e708398f749e480b8a06f5f03
Diffstat (limited to 'res/xml/development_prefs.xml')
| -rw-r--r-- | res/xml/development_prefs.xml | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 71351c4..65f6e48 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -103,6 +103,18 @@ android:title="@string/verify_apps_over_usb_title" android:summary="@string/verify_apps_over_usb_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_networking_category" + android:title="@string/debug_networking_category"> + <SwitchPreference android:key="wifi_display_certification" android:title="@string/wifi_display_certification" @@ -123,12 +135,10 @@ android:title="@string/wifi_allow_scan_with_traffic" /> android:summary="@string/wifi_allow_scan_with_traffic_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" /> + <SwitchPreference + android:key="legacy_dhcp_client" + android:title="@string/legacy_dhcp_client" /> + android:summary="@string/legacy_dhcp_client_summary"/> <ListPreference android:key="select_usb_configuration" |