Merge "Disable tethering when Data Saver mode is on." into nyc-dev

am: 1d3f1e0

* commit '1d3f1e0fde8538ba0edd54009931edd48c097fe0':
  Disable tethering when Data Saver mode is on.

Change-Id: I6de8bec1c969a1fe7a1d1b8bf5d8587d2c0fc6f1
This commit is contained in:
Felipe Leme
2016-04-22 21:43:50 +00:00
committed by android-build-merger
4 changed files with 62 additions and 11 deletions

View File

@@ -2833,6 +2833,8 @@
<string name="tether_settings_title_usb_bluetooth">Tethering</string>
<!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
<string name="tether_settings_title_all">Tethering &amp; portable hotspot</string>
<!-- Tethering controls, footer note displayed when tethering is disabled because Data Saver mode is on [CHAR LIMIT=none]-->
<string name="tether_settings_disabled_on_data_saver">"Can\u2019t tether or use portable hotspots while Data Saver is on"</string>
<!-- USB Tethering options -->
<string name="usb_title">USB</string>