diff options
| author | Mike Beattie <mike@ethernal.org> | 2012-08-30 13:23:04 +1200 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2012-08-30 13:23:04 +1200 |
| commit | 14022b002d2201fb3ca28292d976c90e2d9a15a2 (patch) | |
| tree | a62781abc635fadc4cec10be1b2d3ece673a34fe | |
| parent | 91606c89828e60d8cf9a5ea4ff75b951d6fc042a (diff) | |
altosdroid: rename ambiguous TextView name
Signed-off-by: Mike Beattie <mike@ethernal.org>
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index b44b8ce9..5736a4c7 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -63,7 +63,8 @@ public class AltosDroid extends Activity { // Layout Views private TextView mTitle; - private TextView mSerialView; + + // Flight state values private TextView mCallsignView; private TextView mStateView; private TextView mSpeedView; @@ -75,6 +76,9 @@ public class AltosDroid extends Activity { private TextView mLatitudeView; private TextView mLongitudeView; + // Generic field for extras at the bottom + private TextView mTextView; + // Service private boolean mIsBound = false; private Messenger mService = null; @@ -108,7 +112,7 @@ public class AltosDroid extends Activity { ad.mTitle.append(str); Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show(); //TEST! - ad.mSerialView.setText(Dumper.dump(ad.mConfigData)); + ad.mTextView.setText(Dumper.dump(ad.mConfigData)); break; case TelemetryService.STATE_CONNECTING: ad.mTitle.setText(R.string.title_connecting); @@ -117,14 +121,14 @@ public class AltosDroid extends Activity { case TelemetryService.STATE_NONE: ad.mConfigData = null; ad.mTitle.setText(R.string.title_not_connected); - ad.mSerialView.setText(""); + ad.mTextView.setText(""); break; } break; case MSG_TELEMETRY: ad.update_ui((AltosState) msg.obj); // TEST! - ad.mSerialView.setText(Dumper.dump(msg.obj)); + ad.mTextView.setText(Dumper.dump(msg.obj)); break; } } @@ -218,10 +222,10 @@ public class AltosDroid extends Activity { mTitle = (TextView) findViewById(R.id.title_right_text); // Set up the temporary Text View - mSerialView = (TextView) findViewById(R.id.text); - mSerialView.setMovementMethod(new ScrollingMovementMethod()); - mSerialView.setClickable(false); - mSerialView.setLongClickable(false); + mTextView = (TextView) findViewById(R.id.text); + mTextView.setMovementMethod(new ScrollingMovementMethod()); + mTextView.setClickable(false); + mTextView.setLongClickable(false); mCallsignView = (TextView) findViewById(R.id.callsign_value); mStateView = (TextView) findViewById(R.id.state_value); |