diff options
| author | Erik Kline <ek@google.com> | 2015-04-30 12:58:08 +0900 |
|---|---|---|
| committer | Erik Kline <ek@google.com> | 2015-05-01 19:27:33 +0900 |
| commit | 54861e124c1a3efeb43c95d68a5077a3ec2d99cb (patch) | |
| tree | b264f365c83d8e668ced22cb2f531be773e8e59a /res | |
| parent | e77f0687dd424ccfdc2b1061221c6c8ba4d6ac8d (diff) | |
| download | packages_apps_Settings-54861e124c1a3efeb43c95d68a5077a3ec2d99cb.zip packages_apps_Settings-54861e124c1a3efeb43c95d68a5077a3ec2d99cb.tar.gz packages_apps_Settings-54861e124c1a3efeb43c95d68a5077a3ec2d99cb.tar.bz2 | |
Add settings for persisting the mobile data connection.
Change-Id: I9b92104893e860e2beb63ac86d417419699c085b
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | res/xml/development_prefs.xml | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6e597ca..3f84463 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3557,6 +3557,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> @@ -3583,6 +3585,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> diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 6911892..ecab700 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -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" |