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

am c0df6623: Merge "Add settings for persisting the mobile data connection." into mnc-dev

Browse Source 
* commit 'c0df6623a0eb0ebbdb965111269b96d9f4a4b976':
  Add settings for persisting the mobile data connection.
This commit is contained in:
Erik Kline
2015-05-08 09:23:38 +00:00
committed by Android Git Automerger
parent 4053c047f2 c0df6623a0
commit 3704367ec3
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -3561,6 +3561,8 @@
<string name="wifi_allow_scan_with_traffic">Always allow Wi\u2011Fi Roam Scans</string>
<!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
<string name="legacy_dhcp_client">Use legacy DHCP client</string>
<!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->
<string name="mobile_data_always_on">Cellular data always active</string>
<!-- setting Checkbox summary whether to show options for wireless display certification -->
<string name="wifi_display_certification_summary">Show options for wireless display certification</string>
@@ -3587,6 +3589,7 @@
<!-- Title of warning dialog about the implications of enabling USB debugging -->
<!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
<string name="legacy_dhcp_client_summary">Use the DHCP client from Lollipop instead of the new Android DHCP client.</string>
<string name="mobile_data_always_on_summary">Always keep mobile data active, even when Wi\u2011Fi is active (for fast network switching).</string>
<string name="adb_warning_title">Allow USB debugging?</string>
<!-- Warning text to user about the implications of enabling USB debugging -->
<string name="adb_warning_message">USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification, and read log data.</string>

7
res/xml/development_prefs.xml
View File

@@ -137,9 +137,14 @@
<SwitchPreference
android:key="legacy_dhcp_client"
android:title="@string/legacy_dhcp_client" />
android:title="@string/legacy_dhcp_client"
android:summary="@string/legacy_dhcp_client_summary"/>
<SwitchPreference
android:key="mobile_data_always_on"
android:title="@string/mobile_data_always_on"
android:summary="@string/mobile_data_always_on_summary"/>
<ListPreference
android:key="select_usb_configuration"
android:title="@string/select_usb_configuration_title"