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

Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

Browse Source 
Fix build in DevelopmentSettings.java

Change-Id: I8d89fd46482fae8e708398f749e480b8a06f5f03
This commit is contained in:
Prerepa Viswanadham
2015-03-24 19:08:43 -07:00
parent a450479285 c9d68e97e4
commit 77eb8880e8
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

@@ -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"

5
res/xml/wifi_calling_settings.xml
View File

@@ -26,9 +26,4 @@
android:entryValues="@array/wifi_calling_mode_values"
android:dialogTitle="@string/wifi_calling_mode_dialog_title" />
<SwitchPreference
android:key="wifi_calling_roam"
android:title="@string/wifi_calling_roam_title"
android:persistent="false"/>
</PreferenceScreen>