summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-07-06 06:14:00 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-07-06 06:14:00 +0000
commitcf694adee38d33b25ecfe0b3967de799e4a19c2b (patch)
tree6b5124bc06a2ebbf9c2c38cea878755687a76a6c
parentf12ff31046c1b58f9fb89a378dd0f02a6ff2aea8 (diff)
parent66dfbfaa9c5f08820f1a751f68646c00a3331164 (diff)
Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev
-rw-r--r--packages/SettingsLib/res/values/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index a4302880dfaf..064cc84dc930 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -465,6 +465,8 @@
<string name="wifi_allow_scan_with_traffic">Always allow Wi\u2011Fi Roam Scans</string>
<!-- Setting Checkbox title whether to always keep mobile data active. [CHAR LIMIT=80] -->
<string name="mobile_data_always_on">Mobile data always active</string>
+ <!-- Setting Checkbox title whether to enable hardware acceleration for tethering. [CHAR LIMIT=80] -->
+ <string name="tethering_hardware_offload">Tethering hardware acceleration</string>
<!-- Setting Checkbox title for disabling Bluetooth absolute volume -->
<string name="bluetooth_disable_absolute_volume">Disable absolute volume</string>
<!-- Setting Checkbox title for enabling Bluetooth inband ringing -->
@@ -534,6 +536,7 @@
<!-- Setting Checkbox title whether to enable view attribute inspection -->
<string name="debug_view_attributes">Enable view attribute inspection</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="tethering_hardware_offload_summary">Use tethering hardware acceleration if available</string>
<!-- Title of warning dialog about the implications of enabling USB debugging -->
<string name="adb_warning_title">Allow USB debugging?</string>
<!-- Warning text to user about the implications of enabling USB debugging -->