Merge "Add string for text of bluetooth switch"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e3891e5..c3e5d81 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12286,4 +12286,9 @@
 
     <!-- Summary for see all preference when bluetooth is disable [CHAR LIMIT=none]-->
     <string name="connected_device_see_all_summary">Bluetooth will turn on</string>
+
+    <!-- Switch text for bluetooth feature being on [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_setting_on">On</string>
+    <!-- Switch text for bluetooth feature being off [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_setting_off">Off</string>
 </resources>
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index 3e64de5..2f61452 100644
--- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -83,6 +83,7 @@
 
         SettingsActivity activity = (SettingsActivity) getActivity();
         mSwitchBar = activity.getSwitchBar();
+        mSwitchBar.setSwitchBarText(R.string.bluetooth_setting_on, R.string.bluetooth_setting_off);
         mController = new BluetoothSwitchPreferenceController(activity,
                 new SwitchBarController(mSwitchBar), mFooterPreference);
         Lifecycle lifecycle = getSettingsLifecycle();