Merge branch 'lukeshu'

Conflicts:
	src/us/minak/OnGestureRecognizedListener.java

1 files changed, 40 insertions, 0 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..07457fd
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="us.minak"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+
+        <!-- The main input service -->
+        <service android:name="IMEService"
+            android:label="@string/minak_ime_label"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data android:name="android.view.im" android:resource="@xml/method" />
+        </service>
+
+        <!-- The settings menu activity -->
+        <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>