diff --git a/MyTracks/res/layout/sensor_state.xml b/MyTracks/res/layout/sensor_state.xml index a6cd7f810..d59b0aeb7 100644 --- a/MyTracks/res/layout/sensor_state.xml +++ b/MyTracks/res/layout/sensor_state.xml @@ -125,6 +125,27 @@ limitations under the License. android:text="@string/bpm" /> + + + + + + + + + diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml index cfd7e873c..40ca54239 100644 --- a/MyTracks/res/values-de/strings.xml +++ b/MyTracks/res/values-de/strings.xml @@ -333,6 +333,7 @@ limitations under the License. + Akkukapazität Zeit in Bewegung diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml index a5a9dd358..87d5a61b9 100644 --- a/MyTracks/res/values-fi/strings.xml +++ b/MyTracks/res/values-fi/strings.xml @@ -380,9 +380,9 @@ limitations under the License. W - rpm bpm + Akku Liikkumisaika diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml index 6e25e4817..3f8a69c29 100644 --- a/MyTracks/res/values/do_not_translate.xml +++ b/MyTracks/res/values/do_not_translate.xml @@ -43,6 +43,9 @@ limitations under the License. UA-7222692-2 + + + % android.intent.action.SAVE diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 019b7fe00..adacc5917 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -383,6 +383,7 @@ limitations under the License. rpm bpm + Battery Level Moving Time diff --git a/MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java index 08251014c..c2e2d634c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java @@ -160,6 +160,7 @@ public class SensorStateActivity extends Activity { utils.setUnknown(R.id.cadence_state_register); utils.setUnknown(R.id.power_state_register); utils.setUnknown(R.id.heart_rate_register); + utils.setUnknown(R.id.battery_level_register); return; } @@ -206,5 +207,18 @@ public class SensorStateActivity extends Activity { : Sensor.SensorState.NONE, this)); } + + if (sds.hasBatteryLevel() && sds.getBatteryLevel().hasValue() + && sds.getBatteryLevel().getState() == Sensor.SensorState.SENDING) { + utils.setText(R.id.battery_level_register, + Integer.toString(sds.getBatteryLevel().getValue())); + } else { + utils.setText(R.id.battery_level_register, + SensorUtils.getStateAsString( + sds.hasBatteryLevel() + ? sds.getBatteryLevel().getState() + : Sensor.SensorState.NONE, + this)); + } } }