Revert "Merge branch 'master' of ssh://git.average.org/~/NFCAuthCR"

[YkNeoCR.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index efcae302e317cf8b84de6846edc2ea315e6202a1..73d6683af9f33f0793296d2b3e6ff8b05be43ca4 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,30 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

-      package="org.average.nfcauthcr"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="10"
-              android:targetSdkVersion="17" />
+         package="org.average.nfcauthcr"
+         android:versionCode="1"
+         android:versionName="1.0">
+       <uses-sdk android:minSdkVersion="10"
+                 android:targetSdkVersion="17" />

 
 

-    <uses-permission android:name="android.permission.NFC" />
-    <uses-feature android:name="android.hardware.nfc"
-                  android:required="true" />
+       <uses-permission android:name="android.permission.NFC" />
+       <uses-feature android:name="android.hardware.nfc"
+                     android:required="true" />

 
 

-    <application android:label="@string/app_name"
-                 android:icon="@drawable/yalekey"
-                 android:allowBackup="true"
-                 android:theme="@style/AppTheme">
+       <application android:label="@string/app_name"
+                        android:icon="@drawable/yalekey"
+                        android:allowBackup="true"
+                        android:theme="@style/AppTheme">

 
 

-        <activity android:name=".NFCAuthCREnroll"
-                  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=".NFCAuthCRCheck"
-                  android:label="@string/app_name">
-        </activity>
+               <activity android:name=".Enroll"
+                         android:label="@string/app_name">
+                       <intent-filter>
+                               <action android:name="android.intent.action.MAIN" />
+                               <category android:name="android.intent.category.LAUNCHER" />
+                       </intent-filter>
+               </activity>

 
 

-    </application>
+               <receiver android:name=".Autostart">
+                       <intent-filter>
+                               <action android:name="android.intent.action.USER_PRESENT" />
+                       </intent-filter>
+               </receiver>
+               <receiver android:name=".Autostop">
+                       <intent-filter>
+                               <action android:name="android.intent.action.SCREEN_OFF" />
+                       </intent-filter>
+               </receiver>
+
+               <service android:name=".Check"
+                        android:label="@string/app_name">
+               </service>
+
+       </application>

 </manifest>
 </manifest>