Merge "Add ethernet tether option into AllInOneTetherSettings" into rvc-dev am: 92340eb89e am: 274a4006e1 am: 98cd9d278c am: 4c20cbfbe7

Change-Id: I516f4804473ed8ba56a673451bea126a4979ad8e
This commit is contained in:
Zhen Zhang
2020-04-22 04:05:05 +00:00
committed by Automerger Merge Worker
17 changed files with 823 additions and 317 deletions

View File

@@ -71,6 +71,13 @@
settings:controller="com.android.settings.network.BluetoothTetherPreferenceController"
settings:keywords="@string/keywords_hotspot_tethering" />
<SwitchPreference
android:key="enable_ethernet_tethering_2"
android:title="@string/ethernet_tether_checkbox_text"
android:summary="@string/ethernet_tethering_subtext"
settings:controller="com.android.settings.network.EthernetTetherPreferenceController"
settings:keywords="@string/keywords_hotspot_tethering"/>
<SwitchPreference
android:key="disable_wifi_tethering"
android:title="@string/disable_wifi_hotspot_title"