diff options
| author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-02-07 13:56:13 +0100 |
|---|---|---|
| committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-02-07 13:56:13 +0100 |
| commit | bfe835a58edab5d41831f87e86ec534786db4d4e (patch) | |
| tree | f1ef2d1fe18fcf7f5b949ec021012d64764f626d /same-android/AndroidManifest.xml | |
| parent | 0f5172c073daad5022409344aa25a176beaba431 (diff) | |
Add settings menu to Android app.
– New main activity.
– Options menu to go to Same settings.
Diffstat (limited to 'same-android/AndroidManifest.xml')
| -rw-r--r-- | same-android/AndroidManifest.xml | 5 |
1 files changed, 3 insertions, 2 deletions
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> |