forked from upstream-mirrors/OpenTracks
Adding battery level to sensor state activity.
This commit is contained in:
@@ -125,6 +125,27 @@ limitations under the License.
|
|||||||
android:text="@string/bpm" />
|
android:text="@string/bpm" />
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|
||||||
|
<!-- Battery Level -->
|
||||||
|
<TableRow
|
||||||
|
android:padding="1dip">
|
||||||
|
<TextView
|
||||||
|
android:layout_column="1"
|
||||||
|
android:layout_span="3"
|
||||||
|
android:text="@string/battery_level" />
|
||||||
|
</TableRow>
|
||||||
|
<TableRow
|
||||||
|
android:background="@color/stat_label_background">
|
||||||
|
<TextView
|
||||||
|
style="@style/StatsRegister.Big"
|
||||||
|
android:id="@+id/battery_level_register"
|
||||||
|
android:layout_column="1"
|
||||||
|
android:layout_span="4" />
|
||||||
|
<TextView
|
||||||
|
style="@style/StatsUnitSolo"
|
||||||
|
android:layout_column="5"
|
||||||
|
android:text="@string/percent" />
|
||||||
|
</TableRow>
|
||||||
|
|
||||||
</TableLayout>
|
</TableLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|||||||
@@ -333,6 +333,7 @@ limitations under the License.
|
|||||||
|
|
||||||
<!--string name="revolutions_per_minute">rpm</string-->
|
<!--string name="revolutions_per_minute">rpm</string-->
|
||||||
<!--string name="bpm">bpm</string-->
|
<!--string name="bpm">bpm</string-->
|
||||||
|
<string name="battery_level">Akkukapazität</string>
|
||||||
|
|
||||||
<!-- Stats Labels -->
|
<!-- Stats Labels -->
|
||||||
<string name="moving_time_label">Zeit in Bewegung</string>
|
<string name="moving_time_label">Zeit in Bewegung</string>
|
||||||
|
|||||||
@@ -380,9 +380,9 @@ limitations under the License.
|
|||||||
|
|
||||||
<!-- Sensors -->
|
<!-- Sensors -->
|
||||||
<string name="watts">W</string>
|
<string name="watts">W</string>
|
||||||
|
|
||||||
<string name="revolutions_per_minute">rpm</string>
|
<string name="revolutions_per_minute">rpm</string>
|
||||||
<string name="bpm">bpm</string>
|
<string name="bpm">bpm</string>
|
||||||
|
<string name="battery_level">Akku</string>
|
||||||
|
|
||||||
<!-- Stats Labels -->
|
<!-- Stats Labels -->
|
||||||
<string name="moving_time_label">Liikkumisaika</string>
|
<string name="moving_time_label">Liikkumisaika</string>
|
||||||
|
|||||||
@@ -43,6 +43,9 @@ limitations under the License.
|
|||||||
|
|
||||||
<!-- ID for Google Analytics -->
|
<!-- ID for Google Analytics -->
|
||||||
<string name="google_analytics_id">UA-7222692-2</string>
|
<string name="google_analytics_id">UA-7222692-2</string>
|
||||||
|
|
||||||
|
<!-- Symbols -->
|
||||||
|
<string name="percent">%</string>
|
||||||
|
|
||||||
<!-- Intent actions -->
|
<!-- Intent actions -->
|
||||||
<string name="save_intent_action">android.intent.action.SAVE</string>
|
<string name="save_intent_action">android.intent.action.SAVE</string>
|
||||||
|
|||||||
@@ -383,6 +383,7 @@ limitations under the License.
|
|||||||
|
|
||||||
<string name="revolutions_per_minute">rpm</string>
|
<string name="revolutions_per_minute">rpm</string>
|
||||||
<string name="bpm">bpm</string>
|
<string name="bpm">bpm</string>
|
||||||
|
<string name="battery_level">Battery Level</string>
|
||||||
|
|
||||||
<!-- Stats Labels -->
|
<!-- Stats Labels -->
|
||||||
<string name="moving_time_label">Moving Time</string>
|
<string name="moving_time_label">Moving Time</string>
|
||||||
|
|||||||
@@ -160,6 +160,7 @@ public class SensorStateActivity extends Activity {
|
|||||||
utils.setUnknown(R.id.cadence_state_register);
|
utils.setUnknown(R.id.cadence_state_register);
|
||||||
utils.setUnknown(R.id.power_state_register);
|
utils.setUnknown(R.id.power_state_register);
|
||||||
utils.setUnknown(R.id.heart_rate_register);
|
utils.setUnknown(R.id.heart_rate_register);
|
||||||
|
utils.setUnknown(R.id.battery_level_register);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,5 +207,18 @@ public class SensorStateActivity extends Activity {
|
|||||||
: Sensor.SensorState.NONE,
|
: Sensor.SensorState.NONE,
|
||||||
this));
|
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));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user