Merge heads

2012-04-26 18:59:06 +08:00
parent 420cb0f49b
commit 6848a7a475
43 changed files with 1658 additions and 1414 deletions
@@ -325,7 +325,7 @@ public class SensorStateActivity extends Activity {
    String value;
    if (sds.hasBatteryLevel() && sds.getBatteryLevel().hasValue()
        && sds.getBatteryLevel().getState() == Sensor.SensorState.SENDING) {
-      String format = getString(R.string.sensor_state_battery_value);
+      String format = getString(R.string.value_integer_percent);
      value = String.format(format, sds.getBatteryLevel().getValue());
    } else {
      value = SensorUtils.getStateAsString(