Merge branch 'master' of github.com:Determinant/piztor

1 files changed, 42 insertions, 0 deletions

diff --git a/client/Piztor/AndroidManifest.xml b/client/Piztor/AndroidManifest.xml
new file mode 100644
index 0000000..b18d8e2
--- /dev/null
+++ b/client/Piztor/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.macaroon.piztor"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="17" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.Black.NoTitleBar" >
+        <activity
+            android:name="com.macaroon.piztor.InitAct"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.macaroon.piztor.Login"
+            android:label="@string/title_activity_login" >
+        </activity>
+        <activity
+            android:name="com.macaroon.piztor.Main"
+            android:label="@string/title_activity_main" >
+        </activity>
+        <activity
+            android:name="com.macaroon.piztor.Setting"
+            android:label="@string/title_activity_setting" >
+        </activity>
+    </application>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+</manifest>