diff --git a/res/values/strings.xml b/res/values/strings.xml index bf5b34d06fb..14583b832d9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3744,6 +3744,14 @@ "Can\u2019t tether or use portable hotspots while Data Saver is on" + + + Only share internet via USB + + Only share internet via Bluetooth + + Only share internet via USB and Bluetooth + USB USB tethering diff --git a/res/xml/all_tether_prefs.xml b/res/xml/all_tether_prefs.xml index bc3471b4445..d16adc5c827 100644 --- a/res/xml/all_tether_prefs.xml +++ b/res/xml/all_tether_prefs.xml @@ -74,6 +74,7 @@ diff --git a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java index a7242cfdc74..32f841dbd52 100644 --- a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java +++ b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java @@ -30,6 +30,7 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import com.android.internal.annotations.VisibleForTesting; +import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.TetherUtil; @@ -95,8 +96,14 @@ public final class WifiTetherDisablePreferenceController extends BasePreferenceC @Override public CharSequence getSummary() { - // TODO(b/146818850): Update summary accordingly. - return super.getSummary(); + if (mUSBTetherEnabled && mBluetoothTetherEnabled) { + return mContext.getString(R.string.disable_wifi_hotspot_when_usb_and_bluetooth_on); + } else if (mUSBTetherEnabled) { + return mContext.getString(R.string.disable_wifi_hotspot_when_usb_on); + } else if (mBluetoothTetherEnabled) { + return mContext.getString(R.string.disable_wifi_hotspot_when_bluetooth_on); + } + return mContext.getString(R.string.summary_placeholder); } @Override