PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge Fix build in DevelopmentSettings.java"

Browse Source
This commit is contained in:
Prerepa Viswanadham
2015-03-25 19:59:48 +00:00
committed by Android (Google) Code Review
parent 85d9e16cc1 77eb8880e8
commit 9d2ebc3cf0
8 changed files with 88 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/xml/development_prefs.xml
View File

@@ -109,6 +109,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"
@@ -129,12 +141,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"