From e05884564e369d5b4a107570164e56963a4ad328 Mon Sep 17 00:00:00 2001
From: Jyun LuoLai <jyunluolai@google.com>
Date: Mon, 19 Mar 2018 17:08:33 +0800
Subject: [PATCH] Modify connectivty related strings

Change-Id: I971c5f68ff3d881ad0285f87ab868a204edc9b7f
Fixes: 73960246
Test: Manual test & make RunSettingsRoboTests
---
 res/values/strings.xml                                       | 5 ++++-
 .../android/settings/bluetooth/BluetoothPairingDetail.java   | 2 +-
 src/com/android/settings/wifi/WifiSettings.java              | 2 +-
 .../settings/bluetooth/BluetoothPairingDetailTest.java       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5f2994915cf..db3ce482a84 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1578,7 +1578,7 @@
     <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
     <string name="bluetooth_preference_paired_devices">Paired devices</string>
     <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
-    <string name="bluetooth_preference_found_devices">Available devices</string>
+    <string name="bluetooth_preference_found_media_devices">Available media devices</string>
     <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
     <string name="bluetooth_preference_no_found_devices">No devices available</string>
     <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
@@ -9538,4 +9538,7 @@
     <!--  Summary for battery Suggestion. [CHAR LIMIT=55] -->
     <string name="battery_suggestion_summary"></string>
 
+    <!-- Title for detail page of wifi network [CHAR LIMIT=30] -->
+    <string name="pref_title_network_details">Network details</string>
+
 </resources>
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);
     }