altosdroid: whitespace

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroid.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 521588fbe7b929ebdf7ec4f85bc1ab055dde995e..5b48d5710d73d17f8a13600d0f2f5569785a376b 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -26,16 +26,16 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
-import android.view.KeyEvent;
+//import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
+//import android.view.View;
 import android.view.Window;
-import android.view.View.OnClickListener;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
+//import android.view.View.OnClickListener;
+//import android.view.inputmethod.EditorInfo;
+//import android.widget.Button;
+//import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 import org.altusmetrum.AltosDroid.R;
@@ -61,8 +61,6 @@ public class AltosDroid extends Activity {
     public static final String TOAST = "toast";
 
 
-    private EditText mOutEditText;
-    private Button mSendButton;
 
        // Intent request codes
        private static final int REQUEST_CONNECT_DEVICE = 1;
@@ -71,6 +69,8 @@ public class AltosDroid extends Activity {
        // Layout Views
        private TextView mTitle;
        private TextView mSerialView;
+       //private EditText mOutEditText;
+       //private Button mSendButton;
        // Name of the connected device
        private String mConnectedDeviceName = null;
        // Local Bluetooth adapter
@@ -86,13 +86,19 @@ public class AltosDroid extends Activity {
                setContentView(R.layout.main);
                getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title);
 
-        // Get local Bluetooth adapter
-        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
                // Set up the custom title
                mTitle = (TextView) findViewById(R.id.title_left_text);
                mTitle.setText(R.string.app_name);
                mTitle = (TextView) findViewById(R.id.title_right_text);
 
+               mSerialView = (TextView) findViewById(R.id.in);
+               mSerialView.setMovementMethod(new ScrollingMovementMethod());
+               mSerialView.setClickable(false);
+               mSerialView.setLongClickable(false);
+
+               // Get local Bluetooth adapter
+               mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+
                // If the adapter is null, then Bluetooth is not supported
                if (mBluetoothAdapter == null) {
                        Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show();
@@ -156,11 +162,6 @@ public class AltosDroid extends Activity {
        private void setupChat() {
                Log.d(TAG, "setupChat()");
 
-        mSerialView = (TextView) findViewById(R.id.in);
-        mSerialView.setMovementMethod(new ScrollingMovementMethod());
-        mSerialView.setClickable(false);
-        mSerialView.setLongClickable(false);
-
                // Initialize the compose field with a listener for the return key
                mOutEditText = (EditText) findViewById(R.id.edit_text_out);
                mOutEditText.setOnEditorActionListener(mWriteListener);