From ac55add2b9667068cc3c4f28e5879a5f768b70ba Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 29 May 2012 10:53:35 -0700
Subject: [PATCH] Add BluetoothSensorManager toast message in strings.xml.

---
 MyTracks/res/values/strings.xml                       |  6 ++++++
 .../google/android/apps/mytracks/ImportActivity.java  |  3 +--
 .../apps/mytracks/content/DataSourcesWrapperImpl.java |  2 +-
 .../services/sensors/BluetoothSensorManager.java      | 11 +++++------
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 2d066523f..c8e70d00c 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1745,6 +1745,12 @@ limitations under the License.
       %1$d: sensor id number. E.g., '1'.">
     Paired with: %1$d.
   </string>
+  <string name="settings_sensor_bluetooth_connected"
+    translation_description="The message when connected to a bluetooth sensor.
+    
+      %1$s: sensor name. E.g., 'polar bluetooth'.">
+   Connected to %1$s
+  </string>
   <string name="settings_sensor_bluetooth_options"
     translation_description="In the 'Sensor' settings, the section header to configure the Bluetooth
       options.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
index 228d07ffb..aa49e76f0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
@@ -172,8 +172,7 @@ public class ImportActivity extends Activity {
     if (success) {
       showDialog(DIALOG_RESULT_ID);
     } else {
-      Toast.makeText(this, getString(R.string.sd_card_import_error), Toast.LENGTH_LONG)
-          .show();
+      Toast.makeText(this, R.string.sd_card_import_error, Toast.LENGTH_LONG).show();
       finish();
     }
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java b/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
index 6e4e51de9..9bc57f08c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
@@ -154,7 +154,7 @@ class DataSourcesWrapperImpl implements DataSourcesWrapper {
       }
 
       // Let the user know we have only an approximate location:
-     Toast.makeText(context, context.getString(toastResId), Toast.LENGTH_LONG).show();
+     Toast.makeText(context, toastResId, Toast.LENGTH_LONG).show();
     }
     return loc;
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java
index 6b81b4be4..99b0b4fb2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java
@@ -208,12 +208,11 @@ public class BluetoothSensorManager extends SensorManager {
           }
           break;
         case BluetoothConnectionManager.MESSAGE_DEVICE_NAME:
-          // save the connected device's name
-          connectedDeviceName =
-              msg.getData().getString(BluetoothConnectionManager.DEVICE_NAME);
-          Toast.makeText(context.getApplicationContext(),
-              "Connected to " + connectedDeviceName, Toast.LENGTH_SHORT)
-              .show();
+          // Save the connected device name
+          connectedDeviceName = msg.getData().getString(BluetoothConnectionManager.DEVICE_NAME);
+          Toast.makeText(context,
+              context.getString(R.string.settings_sensor_bluetooth_connected, connectedDeviceName),
+              Toast.LENGTH_SHORT).show();
           break;
       }
     }