Adding battery level to sensor state activity.

This commit is contained in:
Dominik R?ttsches
2011-08-21 15:00:11 +03:00
parent a79e322eff
commit 21012b305f
6 changed files with 41 additions and 1 deletions
+21
View File
@@ -125,6 +125,27 @@ limitations under the License.
android:text="@string/bpm" />
</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>
</LinearLayout>
</ScrollView>
+1
View File
@@ -333,6 +333,7 @@ limitations under the License.
<!--string name="revolutions_per_minute">rpm</string-->
<!--string name="bpm">bpm</string-->
<string name="battery_level">Akkukapazität</string>
<!-- Stats Labels -->
<string name="moving_time_label">Zeit in Bewegung</string>
+1 -1
View File
@@ -380,9 +380,9 @@ limitations under the License.
<!-- Sensors -->
<string name="watts">W</string>
<string name="revolutions_per_minute">rpm</string>
<string name="bpm">bpm</string>
<string name="battery_level">Akku</string>
<!-- Stats Labels -->
<string name="moving_time_label">Liikkumisaika</string>
+3
View File
@@ -43,6 +43,9 @@ limitations under the License.
<!-- ID for Google Analytics -->
<string name="google_analytics_id">UA-7222692-2</string>
<!-- Symbols -->
<string name="percent">%</string>
<!-- Intent actions -->
<string name="save_intent_action">android.intent.action.SAVE</string>
+1
View File
@@ -383,6 +383,7 @@ limitations under the License.
<string name="revolutions_per_minute">rpm</string>
<string name="bpm">bpm</string>
<string name="battery_level">Battery Level</string>
<!-- Stats Labels -->
<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.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));
}
}
}