karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Fix comments for 7057f746f9af

Browse Source
This commit is contained in:
Jimmy Shih
2011-12-16 11:17:37 -08:00
parent 2dc92dcc98
commit 7956e761c8
3 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/sensor_state.xml
+12 -24
View File
@@ -31,62 +31,50 @@ limitations under the License.
<!-- Sensor state --> <!-- Sensor state -->
<TextView <TextView
android:text="@string/menu_sensor_state" android:text="@string/menu_sensor_state"
style="@style/SensorStateHeader" style="@style/SensorStateLabel"/>
/>
<TextView <TextView
android:id="@+id/sensor_state" android:id="@+id/sensor_state"
style="@style/SensorStateValue" style="@style/SensorStateValue"/>
/>
<!-- Last sensor time --> <!-- Last sensor time -->
<TextView <TextView
android:text="@string/sensor_state_last_sensor_time" android:text="@string/sensor_state_last_sensor_time"
style="@style/SensorStateHeader" style="@style/SensorStateLabel"/>
/>
<TextView <TextView
android:id="@+id/sensor_state_last_sensor_time" android:id="@+id/sensor_state_last_sensor_time"
style="@style/SensorStateValue" style="@style/SensorStateValue"/>
/>
<!-- Power --> <!-- Power -->
<TextView <TextView
android:text="@string/sensor_state_power" android:text="@string/sensor_state_power"
style="@style/SensorStateHeader" style="@style/SensorStateLabel"/>
/>
<TextView <TextView
android:id="@+id/sensor_state_power" android:id="@+id/sensor_state_power"
style="@style/SensorStateValue" style="@style/SensorStateValue"/>
/>
<!-- Cadence --> <!-- Cadence -->
<TextView <TextView
android:text="@string/sensor_state_cadence" android:text="@string/sensor_state_cadence"
style="@style/SensorStateHeader" style="@style/SensorStateLabel"/>
/>
<TextView <TextView
android:id="@+id/sensor_state_cadence" android:id="@+id/sensor_state_cadence"
style="@style/SensorStateValue" style="@style/SensorStateValue"/>
/>
<!-- Heart rate --> <!-- Heart rate -->
<TextView <TextView
android:text="@string/sensor_state_heart_rate" android:text="@string/sensor_state_heart_rate"
style="@style/SensorStateHeader" style="@style/SensorStateLabel"/>
/>
<TextView <TextView
android:id="@+id/sensor_state_heart_rate" android:id="@+id/sensor_state_heart_rate"
style="@style/SensorStateValue" style="@style/SensorStateValue"/>
/>
<!-- Battery level --> <!-- Battery level -->
<TextView <TextView
android:text="@string/sensor_state_battery" android:text="@string/sensor_state_battery"
style="@style/SensorStateHeader" style="@style/SensorStateLabel"/>
/>
<TextView <TextView
android:id="@+id/sensor_state_battery" android:id="@+id/sensor_state_battery"
style="@style/SensorStateValue" style="@style/SensorStateValue"/>
/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>
MyTracks/res/values/styles.xml
+1 -1
View File
@@ -71,7 +71,7 @@ limitations under the License.
<item name="android:visibility">gone</item> <item name="android:visibility">gone</item>
</style> </style>
<style name="SensorStateHeader"> <style name="SensorStateLabel">
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:paddingLeft">4dp</item> <item name="android:paddingLeft">4dp</item>
MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java
+21 -22
View File
@@ -248,31 +248,30 @@ public class SensorStateActivity extends Activity {
utils.setUnknown(R.id.sensor_state_power); utils.setUnknown(R.id.sensor_state_power);
utils.setUnknown(R.id.sensor_state_cadence); utils.setUnknown(R.id.sensor_state_cadence);
utils.setUnknown(R.id.sensor_state_battery); utils.setUnknown(R.id.sensor_state_battery);
return; } else {
((TextView) findViewById(R.id.sensor_state_last_sensor_time)).setText(getLastSensorTime(sds));
((TextView) findViewById(R.id.sensor_state_power)).setText(getPower(sds));
((TextView) findViewById(R.id.sensor_state_cadence)).setText(getCadence(sds));
((TextView) findViewById(R.id.sensor_state_heart_rate)).setText(getHeartRate(sds));
((TextView) findViewById(R.id.sensor_state_battery)).setText(getBattery(sds));
} }
setLastSensorTime(sds);
setPower(sds);
setCadence(sds);
setHeartRate(sds);
setBattery(sds);
} }
/** /**
* Sets the last sensor time. * Gets the last sensor time.
* *
* @param sds sensor data set * @param sds sensor data set
*/ */
private void setLastSensorTime(Sensor.SensorDataSet sds) { private String getLastSensorTime(Sensor.SensorDataSet sds) {
String value = TIMESTAMP_FORMAT.format(new Date(sds.getCreationTime())); return TIMESTAMP_FORMAT.format(new Date(sds.getCreationTime()));
((TextView) findViewById(R.id.sensor_state_last_sensor_time)).setText(value);
} }
/** /**
* Sets the power. * Gets the power.
* *
* @param sds sensor data set * @param sds sensor data set
*/ */
private void setPower(Sensor.SensorDataSet sds) { private String getPower(Sensor.SensorDataSet sds) {
String value; String value;
if (sds.hasPower() && sds.getPower().hasValue() if (sds.hasPower() && sds.getPower().hasValue()
&& sds.getPower().getState() == Sensor.SensorState.SENDING) { && sds.getPower().getState() == Sensor.SensorState.SENDING) {
@@ -282,15 +281,15 @@ public class SensorStateActivity extends Activity {
value = SensorUtils.getStateAsString( value = SensorUtils.getStateAsString(
sds.hasPower() ? sds.getPower().getState() : Sensor.SensorState.NONE, this); sds.hasPower() ? sds.getPower().getState() : Sensor.SensorState.NONE, this);
} }
((TextView) findViewById(R.id.sensor_state_power)).setText(value); return value;
} }
/** /**
* Sets the cadence. * Gets the cadence.
* *
* @param sds sensor data set * @param sds sensor data set
*/ */
private void setCadence(Sensor.SensorDataSet sds) { private String getCadence(Sensor.SensorDataSet sds) {
String value; String value;
if (sds.hasCadence() && sds.getCadence().hasValue() if (sds.hasCadence() && sds.getCadence().hasValue()
&& sds.getCadence().getState() == Sensor.SensorState.SENDING) { && sds.getCadence().getState() == Sensor.SensorState.SENDING) {
@@ -300,15 +299,15 @@ public class SensorStateActivity extends Activity {
value = SensorUtils.getStateAsString( value = SensorUtils.getStateAsString(
sds.hasCadence() ? sds.getCadence().getState() : Sensor.SensorState.NONE, this); sds.hasCadence() ? sds.getCadence().getState() : Sensor.SensorState.NONE, this);
} }
((TextView) findViewById(R.id.sensor_state_cadence)).setText(value); return value;
} }
/** /**
* Sets the heart rate. * Gets the heart rate.
* *
* @param sds sensor data set * @param sds sensor data set
*/ */
private void setHeartRate(Sensor.SensorDataSet sds) { private String getHeartRate(Sensor.SensorDataSet sds) {
String value; String value;
if (sds.hasHeartRate() && sds.getHeartRate().hasValue() if (sds.hasHeartRate() && sds.getHeartRate().hasValue()
&& sds.getHeartRate().getState() == Sensor.SensorState.SENDING) { && sds.getHeartRate().getState() == Sensor.SensorState.SENDING) {
@@ -318,15 +317,15 @@ public class SensorStateActivity extends Activity {
value = SensorUtils.getStateAsString( value = SensorUtils.getStateAsString(
sds.hasHeartRate() ? sds.getHeartRate().getState() : Sensor.SensorState.NONE, this); sds.hasHeartRate() ? sds.getHeartRate().getState() : Sensor.SensorState.NONE, this);
} }
((TextView) findViewById(R.id.sensor_state_heart_rate)).setText(value); return value;
} }
/** /**
* Sets the battery level. * Gets the battery.
* *
* @param sds sensor data set * @param sds sensor data set
*/ */
private void setBattery(Sensor.SensorDataSet sds) { private String getBattery(Sensor.SensorDataSet sds) {
String value; String value;
if (sds.hasBatteryLevel() && sds.getBatteryLevel().hasValue() if (sds.hasBatteryLevel() && sds.getBatteryLevel().hasValue()
&& sds.getBatteryLevel().getState() == Sensor.SensorState.SENDING) { && sds.getBatteryLevel().getState() == Sensor.SensorState.SENDING) {
@@ -336,6 +335,6 @@ public class SensorStateActivity extends Activity {
value = SensorUtils.getStateAsString( value = SensorUtils.getStateAsString(
sds.hasBatteryLevel() ? sds.getBatteryLevel().getState() : Sensor.SensorState.NONE, this); sds.hasBatteryLevel() ? sds.getBatteryLevel().getState() : Sensor.SensorState.NONE, this);
} }
((TextView) findViewById(R.id.sensor_state_battery)).setText(value); return value;
} }
} }