From bfe835a58edab5d41831f87e86ec534786db4d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 7 Feb 2012 13:56:13 +0100
Subject: Add settings menu to Android app.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– New main activity.
– Options menu to go to Same settings.
---
 same-android/AndroidManifest.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'same-android/AndroidManifest.xml')

diff --git a/same-android/AndroidManifest.xml b/same-android/AndroidManifest.xml
index 339fb73..a839f8c 100644
--- a/same-android/AndroidManifest.xml
+++ b/same-android/AndroidManifest.xml
@@ -10,13 +10,14 @@
     <application
         android:icon="@drawable/icon"
         android:label="@string/app_name" >
-        <activity android:name=".SameControllerActivity" >
+        <activity android:name=".MainActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        
+        <activity android:name=".SameControllerActivity"/>
 
         <service android:name=".discovery.SameService" />
     </application>
-- 
cgit v1.2.3