diff options
-rw-r--r-- | Defogger/src/no/mork/android/defogger/MainActivity.java | 32 | ||||
-rw-r--r-- | Defogger/src/no/mork/android/defogger/ScannerActivity.java | 1 |
2 files changed, 18 insertions, 15 deletions
diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java index efd7c55..a3bc0d7 100644 --- a/Defogger/src/no/mork/android/defogger/MainActivity.java +++ b/Defogger/src/no/mork/android/defogger/MainActivity.java @@ -9,20 +9,22 @@ import android.widget.Button; import no.mork.android.defogger.ScannerActivity; public class MainActivity extends Activity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - Button start_scan = (Button) findViewById(R.id.start_scan); - // button2 = (Button) findViewById(R.id.button2); - - start_scan.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent = new Intent(view.getContext(), ScannerActivity.class); - view.getContext().startActivity(intent);} + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + Button start_scan = (Button) findViewById(R.id.start_scan); + // button2 = (Button) findViewById(R.id.button2); + + + start_scan.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(view.getContext(), ScannerActivity.class); + view.getContext().startActivity(intent); + } }); - - } + + } } diff --git a/Defogger/src/no/mork/android/defogger/ScannerActivity.java b/Defogger/src/no/mork/android/defogger/ScannerActivity.java index aa4d136..6389648 100644 --- a/Defogger/src/no/mork/android/defogger/ScannerActivity.java +++ b/Defogger/src/no/mork/android/defogger/ScannerActivity.java @@ -14,5 +14,6 @@ public class ScannerActivity extends Activity { CharSequence text = "Hello toast!"; Toast.makeText(getApplicationContext(), text, Toast.LENGTH_LONG).show(); + finish(); } } |