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

Reorder the items in Sensor State.

Browse Source
This commit is contained in:
Jimmy Shih
2012-05-26 12:20:11 -07:00
parent a679d96f93
commit d4b985cf5b
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/sensor_state.xml
+6 -6
View File
@@ -34,12 +34,12 @@ limitations under the License.
<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 --> <!-- Heart rate -->
<TextView <TextView
android:text="@string/sensor_state_power" android:text="@string/sensor_state_heart_rate"
style="@style/TextMedium" /> style="@style/TextMedium" />
<TextView <TextView
android:id="@+id/sensor_state_power" android:id="@+id/sensor_state_heart_rate"
style="@style/SensorStateValue" /> style="@style/SensorStateValue" />
<!-- Cadence --> <!-- Cadence -->
<TextView <TextView
@@ -48,12 +48,12 @@ limitations under the License.
<TextView <TextView
android:id="@+id/sensor_state_cadence" android:id="@+id/sensor_state_cadence"
style="@style/SensorStateValue" /> style="@style/SensorStateValue" />
<!-- Heart rate --> <!-- Power -->
<TextView <TextView
android:text="@string/sensor_state_heart_rate" android:text="@string/sensor_state_power"
style="@style/TextMedium" /> style="@style/TextMedium" />
<TextView <TextView
android:id="@+id/sensor_state_heart_rate" android:id="@+id/sensor_state_power"
style="@style/SensorStateValue" /> style="@style/SensorStateValue" />
<!-- Battery level --> <!-- Battery level -->
<TextView <TextView
MyTracks/src/com/google/android/apps/mytracks/SensorStateActivity.java
+21 -21
View File
@@ -199,19 +199,19 @@ public class SensorStateActivity extends AbstractMyTracksActivity {
String lastSensorTime = sensorDataSet == null ? getString(R.string.value_unknown) String lastSensorTime = sensorDataSet == null ? getString(R.string.value_unknown)
: getLastSensorTime(sensorDataSet); : getLastSensorTime(sensorDataSet);
String power = sensorDataSet == null ? getString(R.string.value_unknown)
: getPower(sensorDataSet);
String cadence = sensorDataSet == null ? getString(R.string.value_unknown)
: getCadence(sensorDataSet);
String heartRate = sensorDataSet == null ? getString(R.string.value_unknown) String heartRate = sensorDataSet == null ? getString(R.string.value_unknown)
: getHeartRate(sensorDataSet); : getHeartRate(sensorDataSet);
String cadence = sensorDataSet == null ? getString(R.string.value_unknown)
: getCadence(sensorDataSet);
String power = sensorDataSet == null ? getString(R.string.value_unknown)
: getPower(sensorDataSet);
String battery = sensorDataSet == null ? getString(R.string.value_unknown) String battery = sensorDataSet == null ? getString(R.string.value_unknown)
: getBattery(sensorDataSet); : getBattery(sensorDataSet);
((TextView) findViewById(R.id.sensor_state_last_sensor_time)).setText(lastSensorTime); ((TextView) findViewById(R.id.sensor_state_last_sensor_time)).setText(lastSensorTime);
((TextView) findViewById(R.id.sensor_state_power)).setText(power);
((TextView) findViewById(R.id.sensor_state_cadence)).setText(cadence);
((TextView) findViewById(R.id.sensor_state_heart_rate)).setText(heartRate); ((TextView) findViewById(R.id.sensor_state_heart_rate)).setText(heartRate);
((TextView) findViewById(R.id.sensor_state_cadence)).setText(cadence);
((TextView) findViewById(R.id.sensor_state_power)).setText(power);
((TextView) findViewById(R.id.sensor_state_battery)).setText(battery); ((TextView) findViewById(R.id.sensor_state_battery)).setText(battery);
} }
@@ -225,19 +225,20 @@ public class SensorStateActivity extends AbstractMyTracksActivity {
} }
/** /**
* Gets the power. * Gets the heart rate.
* *
* @param sensorDataSet sensor data set * @param sensorDataSet sensor data set
*/ */
private String getPower(Sensor.SensorDataSet sensorDataSet) { private String getHeartRate(Sensor.SensorDataSet sensorDataSet) {
String value; String value;
if (sensorDataSet.hasPower() && sensorDataSet.getPower().hasValue() if (sensorDataSet.hasHeartRate() && sensorDataSet.getHeartRate().hasValue()
&& sensorDataSet.getPower().getState() == Sensor.SensorState.SENDING) { && sensorDataSet.getHeartRate().getState() == Sensor.SensorState.SENDING) {
value = getString(R.string.sensor_state_power_value, sensorDataSet.getPower().getValue()); value = getString(
R.string.sensor_state_heart_rate_value, sensorDataSet.getHeartRate().getValue());
} else { } else {
value = SensorUtils.getStateAsString( value = SensorUtils.getStateAsString(
sensorDataSet.hasPower() ? sensorDataSet.getPower().getState() : Sensor.SensorState.NONE, sensorDataSet.hasHeartRate() ? sensorDataSet.getHeartRate().getState()
this); : Sensor.SensorState.NONE, this);
} }
return value; return value;
} }
@@ -261,20 +262,19 @@ public class SensorStateActivity extends AbstractMyTracksActivity {
} }
/** /**
* Gets the heart rate. * Gets the power.
* *
* @param sensorDataSet sensor data set * @param sensorDataSet sensor data set
*/ */
private String getHeartRate(Sensor.SensorDataSet sensorDataSet) { private String getPower(Sensor.SensorDataSet sensorDataSet) {
String value; String value;
if (sensorDataSet.hasHeartRate() && sensorDataSet.getHeartRate().hasValue() if (sensorDataSet.hasPower() && sensorDataSet.getPower().hasValue()
&& sensorDataSet.getHeartRate().getState() == Sensor.SensorState.SENDING) { && sensorDataSet.getPower().getState() == Sensor.SensorState.SENDING) {
value = getString( value = getString(R.string.sensor_state_power_value, sensorDataSet.getPower().getValue());
R.string.sensor_state_heart_rate_value, sensorDataSet.getHeartRate().getValue());
} else { } else {
value = SensorUtils.getStateAsString( value = SensorUtils.getStateAsString(
sensorDataSet.hasHeartRate() ? sensorDataSet.getHeartRate().getState() sensorDataSet.hasPower() ? sensorDataSet.getPower().getState() : Sensor.SensorState.NONE,
: Sensor.SensorState.NONE, this); this);
} }
return value; return value;
} }
MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java
+3 -3
View File
@@ -31,9 +31,9 @@ import android.util.Log;
*/ */
public class SensorManagerFactory { public class SensorManagerFactory {
private String activeSensorType; private String activeSensorType = null;
private SensorManager activeSensorManager; private SensorManager activeSensorManager = null;
private int refCount; private int refCount = 0;
private static SensorManagerFactory instance = new SensorManagerFactory(); private static SensorManagerFactory instance = new SensorManagerFactory();