diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index c2c9fb3f2..88e24509d 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -510,10 +510,6 @@ limitations under the License. %1$s time. E.g, '2/15/2012 1:40 PM'"> Recorded: %1$s - - Battery level (%) - Cadence (rpm) diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java index e74e8a709..0cc194a40 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java @@ -146,8 +146,7 @@ public class CsvTrackWriter implements TrackFormatWriter { context.getString(R.string.description_time), context.getString(R.string.description_sensor_power), context.getString(R.string.description_sensor_cadence), - context.getString(R.string.description_sensor_heart_rate), - context.getString(R.string.description_sensor_battery_level)); + context.getString(R.string.description_sensor_heart_rate)); } @Override @@ -171,7 +170,6 @@ public class CsvTrackWriter implements TrackFormatWriter { String power = null; String cadence = null; String heartRate = null; - String batteryLevel = null; if (location instanceof MyTracksLocation) { SensorDataSet sensorDataSet = ((MyTracksLocation) location).getSensorDataSet(); @@ -194,12 +192,6 @@ public class CsvTrackWriter implements TrackFormatWriter { heartRate = Double.toString(sensorData.getValue()); } } - if (sensorDataSet.hasBatteryLevel()) { - SensorData sensorData = sensorDataSet.getBatteryLevel(); - if (sensorData.hasValue() && sensorData.getState() == Sensor.SensorState.SENDING) { - batteryLevel = Double.toString(sensorData.getValue()); - } - } } } pointIndex++; @@ -214,8 +206,7 @@ public class CsvTrackWriter implements TrackFormatWriter { StringUtils.formatDateTimeIso8601(location.getTime()), power, cadence, - heartRate, - batteryLevel); + heartRate); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java index dff35b1f6..6a7aecb2a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java @@ -56,7 +56,6 @@ public class KmlTrackWriter implements TrackFormatWriter { private static final String CADENCE = "cadence"; private static final String HEART_RATE = "heart_rate"; private static final String POWER = "power"; - private static final String BATTER_LEVEL = "battery_level"; private static final String WAYPOINT_ICON = "http://maps.google.com/mapfiles/kml/pushpin/blue-pushpin.png"; @@ -76,11 +75,9 @@ public class KmlTrackWriter implements TrackFormatWriter { private ArrayList powerList = new ArrayList(); private ArrayList cadenceList = new ArrayList(); private ArrayList heartRateList = new ArrayList(); - private ArrayList batteryLevelList = new ArrayList(); private boolean hasPower; private boolean hasCadence; private boolean hasHeartRate; - private boolean hasBatteryLevel; public KmlTrackWriter(Context context) { this(context, new DescriptionGeneratorImpl(context)); @@ -136,7 +133,6 @@ public class KmlTrackWriter implements TrackFormatWriter { writeSensorStyle(POWER, context.getString(R.string.description_sensor_power)); writeSensorStyle(CADENCE, context.getString(R.string.description_sensor_cadence)); writeSensorStyle(HEART_RATE, context.getString(R.string.description_sensor_heart_rate)); - writeSensorStyle(BATTER_LEVEL, context.getString(R.string.description_sensor_battery_level)); printWriter.println(""); } } @@ -209,11 +205,9 @@ public class KmlTrackWriter implements TrackFormatWriter { hasPower = false; hasCadence = false; hasHeartRate = false; - hasBatteryLevel = false; powerList.clear(); cadenceList.clear(); heartRateList.clear(); - batteryLevelList.clear(); } } @@ -231,9 +225,6 @@ public class KmlTrackWriter implements TrackFormatWriter { if (hasHeartRate) { writeSensorData(heartRateList, HEART_RATE); } - if (hasBatteryLevel) { - writeSensorData(batteryLevelList, BATTER_LEVEL); - } printWriter.println(""); printWriter.println(""); printWriter.println(""); @@ -252,7 +243,6 @@ public class KmlTrackWriter implements TrackFormatWriter { int power = -1; int cadence = -1; int heartRate = -1; - int batteryLevel = -1; if (sensorDataSet != null) { if (sensorDataSet.hasPower()) { @@ -275,19 +265,11 @@ public class KmlTrackWriter implements TrackFormatWriter { hasHeartRate = true; heartRate = sensorData.getValue(); } - } - if (sensorDataSet.hasBatteryLevel()) { - SensorData sensorData = sensorDataSet.getBatteryLevel(); - if (sensorData.hasValue() && sensorData.getState() == Sensor.SensorState.SENDING) { - hasBatteryLevel = true; - batteryLevel = sensorData.getValue(); - } - } + } } powerList.add(power); cadenceList.add(cadence); heartRateList.add(heartRate); - batteryLevelList.add(batteryLevel); } } } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java index 0d798115f..921839420 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java @@ -49,15 +49,15 @@ public class CsvTrackWriterTest extends TrackFormatWriterTest { "1970-01-01T00:03:20.000Z"); String expectedPointHeader = getExpectedLine("Segment", "Point", "Latitude (deg)", "Longitude (deg)", "Altitude (m)", "Bearing (deg)", "Accuracy (m)", "Speed (m/s)", "Time", - "Power (W)", "Cadence (rpm)", "Heart rate (bpm)", "Battery level (%)"); + "Power (W)", "Cadence (rpm)", "Heart rate (bpm)"); String expectedPoint1 = getExpectedLine("1", "1", "0.0", "0.0", "0.0", "0.0", "0", "0", - "1970-01-01T00:00:00.000Z", "100.0", "200.0", "300.0", "400.0"); + "1970-01-01T00:00:00.000Z", "100.0", "200.0", "300.0"); String expectedPoint2 = getExpectedLine("1", "2", "1.0", "-1.0", "10.0", "100.0", "1,000", - "10,000", "1970-01-01T00:01:40.000Z", "101.0", "201.0", "301.0", "401.0"); + "10,000", "1970-01-01T00:01:40.000Z", "101.0", "201.0", "301.0"); String expectedPoint3 = getExpectedLine("2", "1", "2.0", "-2.0", "20.0", "200.0", "2,000", - "20,000", "1970-01-01T00:03:20.000Z", "102.0", "202.0", "302.0", "402.0"); + "20,000", "1970-01-01T00:03:20.000Z", "102.0", "202.0", "302.0"); String expectedPoint4 = getExpectedLine("2", "2", "3.0", "-3.0", "30.0", "300.0", "3,000", - "30,000", "1970-01-01T00:05:00.000Z", "103.0", "203.0", "303.0", "403.0"); + "30,000", "1970-01-01T00:05:00.000Z", "103.0", "203.0", "303.0"); String expected = expectedTrackHeader + expectedTrack + "\n" + expectedMarkerHeader + expectedMarker1 + expectedMarker2 + "\n" + expectedPointHeader + expectedPoint1 + expectedPoint2 + expectedPoint3 + expectedPoint4; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java index 3ffdec48a..c74feb0f1 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackFormatWriterTest.java @@ -99,11 +99,9 @@ public abstract class TrackFormatWriterTest extends AndroidTestCase { Sensor.SensorData.Builder cadence = Sensor.SensorData.newBuilder().setValue(200 + i) .setState(Sensor.SensorState.SENDING); Sensor.SensorData.Builder heartRate = Sensor.SensorData.newBuilder().setValue(300 + i) - .setState(Sensor.SensorState.SENDING); - Sensor.SensorData.Builder batteryLevel = Sensor.SensorData.newBuilder().setValue(400 + i) - .setState(Sensor.SensorState.SENDING); + .setState(Sensor.SensorState.SENDING); Sensor.SensorDataSet sensorDataSet = Sensor.SensorDataSet.newBuilder().setPower(power) - .setCadence(cadence).setHeartRate(heartRate).setBatteryLevel(batteryLevel).build(); + .setCadence(cadence).setHeartRate(heartRate).build(); location.setSensorDataSet(sensorDataSet); } }