summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-05-04 20:21:03 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-05-04 20:21:03 -0400
commit186008703167dd4bfde6cafcc15dc2badb37957a (patch)
treeb48d918d6b4d3f576b8ef279e5862daf1c763480 /AndroidManifest.xml
parent04514f7137f67967d2384be29194d7f09a6ceb06 (diff)
parente5ce76cc030792de5a53dc8aad3b214ab2f6538b (diff)
Merge branch 'lukeshu' of https://github.com/AndrewMurrell/minak into lukeshu
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml17
1 files changed, 10 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b061ef0..07457fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -12,9 +12,9 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
-
+
<!-- The main input service -->
- <service android:name="us.minak.IMEService"
+ <service android:name="IMEService"
android:label="@string/minak_ime_label"
android:permission="android.permission.BIND_INPUT_METHOD">
<intent-filter>
@@ -22,16 +22,19 @@
</intent-filter>
<meta-data android:name="android.view.im" android:resource="@xml/method" />
</service>
-
+
<!-- The settings menu activity -->
- <!--
- <activity android:name="us.minak.SettingsActivity"
- android:label="@string/minak_settings_label">
+ <activity android:name=".SettingsActivity" android:label="@string/minak_settings_label">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
- -->
+
+ <!-- The individual gesture editor -->
+ <activity
+ android:name="CreateGestureActivity"
+ android:label="@string/label_create_gesture" />
+
</application>
</manifest>