android wip

Signed-off-by: Bjørn Mork <bjorn@mork.no>

2 files changed, 5 insertions, 8 deletions

diff --git a/Defogger/AndroidManifest.xml b/Defogger/AndroidManifest.xml
index 49e15fc..686ca8b 100644
--- a/Defogger/AndroidManifest.xml
+++ b/Defogger/AndroidManifest.xml
@@ -14,7 +14,7 @@
   -->
   
   <application a:label="Defogger">
-        <activity a:name=".MainActivity">
+        <activity a:name="no.mork.android.defogger.MainActivity">
           <intent-filter>
             <category a:name="android.intent.category.LAUNCHER"/>
             <action a:name="android.intent.action.MAIN"/>
@@ -22,9 +22,8 @@
         </activity>
 
        <activity
-            a:name=".ScannerActivity"
-            a:label="Scanning"
-            a:windowSoftInputMode="stateHidden"/>
+           a:name="no.mork.android.defogger.ScannerActivity"
+	   a:parentActivityName="no.mork.android.defogger.MainActivity" />
 	
   </application>
 
diff --git a/Defogger/src/no/mork/android/defogger/ScannerActivity.java b/Defogger/src/no/mork/android/defogger/ScannerActivity.java
index 6298634..aa4d136 100644
--- a/Defogger/src/no/mork/android/defogger/ScannerActivity.java
+++ b/Defogger/src/no/mork/android/defogger/ScannerActivity.java
@@ -9,12 +9,10 @@ public class ScannerActivity extends Activity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
       super.onCreate(savedInstanceState);
+      //setContentView(R.layout.activity_main);
 
-      Context context = getApplicationContext();
       CharSequence text = "Hello toast!";
-      int duration = Toast.LENGTH_LONG;
 
-      Toast toast = Toast.makeText(context, text, duration);
-      toast.show();
+      Toast.makeText(getApplicationContext(), text, Toast.LENGTH_LONG).show();
    }
 }