diff --git a/res/values/strings.xml b/res/values/strings.xml index 01daa6892bb..071c0c71946 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1584,7 +1584,7 @@ Paired devices - Available devices + Available media devices No devices available @@ -9561,4 +9561,7 @@ + + Network details + diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java index 1a64f262684..b31d4c859cf 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -148,7 +148,7 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme mLocalAdapter.setBluetoothEnabled(true); addDeviceCategory(mAvailableDevicesCategory, - R.string.bluetooth_preference_found_devices, + R.string.bluetooth_preference_found_media_devices, BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, mInitialScanStarted); updateFooterPreference(mFooterPreference); mAlwaysDiscoverable.start(); diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 4f6701267fe..7c1b725fac8 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -876,7 +876,7 @@ public class WifiSettings extends RestrictedSettingsFragment private void launchNetworkDetailsFragment(ConnectedAccessPointPreference pref) { new SubSettingLauncher(getContext()) - .setTitle(pref.getTitle()) + .setTitle(getContext().getString(R.string.pref_title_network_details)) .setDestination(WifiNetworkDetailsFragment.class.getName()) .setArguments(pref.getExtras()) .setSourceMetricsCategory(getMetricsCategory()) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index 1364c6320a5..ece706d4362 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -114,7 +114,7 @@ public class BluetoothPairingDetailTest { mFragment.updateContent(BluetoothAdapter.STATE_ON); verify(mFragment).addDeviceCategory(mAvailableDevicesCategory, - R.string.bluetooth_preference_found_devices, + R.string.bluetooth_preference_found_media_devices, BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, false); verify(mLocalAdapter).setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE); }