diff options
| -rw-r--r-- | altosdroid/res/layout/main.xml | 33 | ||||
| -rw-r--r-- | altosdroid/res/layout/message.xml | 21 | ||||
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 20 |
3 files changed, 2 insertions, 72 deletions
diff --git a/altosdroid/res/layout/main.xml b/altosdroid/res/layout/main.xml deleted file mode 100644 index 00ca63c8..00000000 --- a/altosdroid/res/layout/main.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - > - - <TextView - android:id="@+id/in" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:gravity="bottom" - android:scrollbars="vertical" - android:textSize="7dp" - android:typeface="monospace" /> - -</LinearLayout> diff --git a/altosdroid/res/layout/message.xml b/altosdroid/res/layout/message.xml deleted file mode 100644 index 8fa358c9..00000000 --- a/altosdroid/res/layout/message.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="18sp" - android:padding="5dp" -/>
\ No newline at end of file diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index caa1a1c5..61931731 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -33,7 +33,6 @@ import android.os.Handler; import android.os.Message; import android.os.Messenger; import android.os.RemoteException; -import android.text.method.ScrollingMovementMethod; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -45,9 +44,6 @@ import android.app.AlertDialog; import org.altusmetrum.altoslib_1.*; -/** - * This is the main Activity that displays the current chat session. - */ public class AltosDroid extends Activity { // Debugging private static final String TAG = "AltosDroid"; @@ -79,8 +75,7 @@ public class AltosDroid extends Activity { private TextView mLatitudeView; private TextView mLongitudeView; - // Generic field for extras at the bottom - private TextView mTextView; + // field to display the version at the bottom of the screen private TextView mVersion; // Service @@ -118,8 +113,6 @@ public class AltosDroid extends Activity { ad.mTitle.append(str); Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show(); ad.mAltosVoice.speak("Connected"); - //TEST! - //ad.mTextView.setText(Dumper.dump(ad.mConfigData)); break; case TelemetryService.STATE_CONNECTING: ad.mTitle.setText(R.string.title_connecting); @@ -128,14 +121,11 @@ public class AltosDroid extends Activity { case TelemetryService.STATE_NONE: ad.mConfigData = null; ad.mTitle.setText(R.string.title_not_connected); - ad.mTextView.setText(""); break; } break; case MSG_TELEMETRY: ad.update_ui((AltosState) msg.obj); - // TEST! - //ad.mTextView.setText(Dumper.dump(msg.obj)); break; } } @@ -235,7 +225,6 @@ public class AltosDroid extends Activity { // Set up the window layout requestWindowFeature(Window.FEATURE_CUSTOM_TITLE); - //setContentView(R.layout.main); setContentView(R.layout.altosdroid); getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title); @@ -244,12 +233,7 @@ public class AltosDroid extends Activity { mTitle.setText(R.string.app_name); mTitle = (TextView) findViewById(R.id.title_right_text); - // Set up the temporary Text View - mTextView = (TextView) findViewById(R.id.text); - mTextView.setMovementMethod(new ScrollingMovementMethod()); - mTextView.setClickable(false); - mTextView.setLongClickable(false); - + // Display the Version mVersion = (TextView) findViewById(R.id.version); mVersion.setText("Version: " + BuildInfo.version + " Built: " + BuildInfo.builddate + " " + BuildInfo.buildtime + " " + BuildInfo.buildtz + |