diff options
| -rw-r--r-- | altosdroid/res/layout/altosdroid.xml | 22 | ||||
| -rw-r--r-- | altosdroid/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 12 |
3 files changed, 19 insertions, 19 deletions
diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml index 0392ba01..e4b4f605 100644 --- a/altosdroid/res/layout/altosdroid.xml +++ b/altosdroid/res/layout/altosdroid.xml @@ -150,7 +150,7 @@ </RelativeLayout> <RelativeLayout - android:id="@+id/altitude_container" + android:id="@+id/height_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" @@ -158,23 +158,23 @@ android:layout_toRightOf="@id/strut" > <TextView - android:id="@+id/altitude_label" + android:id="@+id/height_label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/altitude_label" /> + android:text="@string/height_label" /> <TextView - android:id="@+id/altitude_value" + android:id="@+id/height_value" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/altitude_label" android:layout_alignParentRight="true" + android:layout_below="@+id/height_label" android:text="" android:textAppearance="?android:attr/textAppearanceLarge" /> </RelativeLayout> <RelativeLayout - android:id="@+id/azimuth_container" + android:id="@+id/elevation_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" @@ -182,17 +182,17 @@ android:layout_toLeftOf="@id/strut" > <TextView - android:id="@+id/azimuth_label" + android:id="@+id/elevation_label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/azimuth_label" /> + android:text="@string/elevation_label" /> <TextView - android:id="@+id/azimuth_value" + android:id="@+id/elevation_value" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/azimuth_label" android:layout_alignParentRight="true" + android:layout_below="@+id/elevation_label" android:text="" android:textAppearance="?android:attr/textAppearanceLarge" /> </RelativeLayout> @@ -226,7 +226,7 @@ android:id="@+id/latitude_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/azimuth_container" > + android:layout_below="@+id/elevation_container" > <TextView android:id="@+id/latitude_label" diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml index e100100f..2f8a9ddc 100644 --- a/altosdroid/res/values/strings.xml +++ b/altosdroid/res/values/strings.xml @@ -47,8 +47,8 @@ <string name="speed_label">Speed</string> <string name="accel_label">Acceleration</string> <string name="range_label">Range</string> - <string name="altitude_label">Altitude</string> - <string name="azimuth_label">Azimuth</string> + <string name="height_label">Height</string> + <string name="elevation_label">Elevation</string> <string name="bearing_label">Bearing</string> <string name="latitude_label">Latitude</string> <string name="longitude_label">Longitude</string> diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 9ecce681..f8e60e28 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -69,8 +69,8 @@ public class AltosDroid extends Activity { private TextView mSpeedView; private TextView mAccelView; private TextView mRangeView; - private TextView mAltitudeView; - private TextView mAzimuthView; + private TextView mHeightView; + private TextView mElevationView; private TextView mBearingView; private TextView mLatitudeView; private TextView mLongitudeView; @@ -182,8 +182,8 @@ public class AltosDroid extends Activity { mSpeedView.setText(String.format("%6.0f m/s", speed)); mAccelView.setText(String.format("%6.0f m/s²", state.acceleration)); mRangeView.setText(String.format("%6.0f m", state.range)); - mAltitudeView.setText(String.format("%6.0f m", state.height)); - mAzimuthView.setText(String.format("%3.0f°", state.elevation)); + mHeightView.setText(String.format("%6.0f m", state.height)); + mElevationView.setText(String.format("%3.0f°", state.elevation)); if (state.from_pad != null) mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing)); mLatitudeView.setText(pos(state.gps.lat, "N", "S")); @@ -228,8 +228,8 @@ public class AltosDroid extends Activity { mSpeedView = (TextView) findViewById(R.id.speed_value); mAccelView = (TextView) findViewById(R.id.accel_value); mRangeView = (TextView) findViewById(R.id.range_value); - mAltitudeView = (TextView) findViewById(R.id.altitude_value); - mAzimuthView = (TextView) findViewById(R.id.azimuth_value); + mHeightView = (TextView) findViewById(R.id.height_value); + mElevationView = (TextView) findViewById(R.id.elevation_value); mBearingView = (TextView) findViewById(R.id.bearing_value); mLatitudeView = (TextView) findViewById(R.id.latitude_value); mLongitudeView = (TextView) findViewById(R.id.longitude_value); |