Commit b3d818d08e3f9c00b59d14e4e92fd8cd45d3333f
1 parent
6feece85
Mise a jour du manifest
Showing
1 changed file
with
15 additions
and
2 deletions
Show diff stats
PremiereActivite/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@ | @@ -2,6 +2,10 @@ | ||
2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
3 | package="com.example.app_10p5"> | 3 | package="com.example.app_10p5"> |
4 | 4 | ||
5 | + <uses-permission android:name="android.permission.NFC" /> | ||
6 | + <uses-sdk android:minSdkVersion="22"/> | ||
7 | + <uses-feature android:name="android.hardware.nfc" android:required="true" /> | ||
8 | + | ||
5 | <application | 9 | <application |
6 | android:allowBackup="true" | 10 | android:allowBackup="true" |
7 | android:icon="@mipmap/ic_launcher" | 11 | android:icon="@mipmap/ic_launcher" |
@@ -13,7 +17,6 @@ | @@ -13,7 +17,6 @@ | ||
13 | android:label="10p5"> | 17 | android:label="10p5"> |
14 | <intent-filter> | 18 | <intent-filter> |
15 | <action android:name="android.intent.action.MAIN" /> | 19 | <action android:name="android.intent.action.MAIN" /> |
16 | - | ||
17 | <category android:name="android.intent.category.LAUNCHER" /> | 20 | <category android:name="android.intent.category.LAUNCHER" /> |
18 | </intent-filter> | 21 | </intent-filter> |
19 | </activity> | 22 | </activity> |
@@ -23,7 +26,17 @@ | @@ -23,7 +26,17 @@ | ||
23 | android:parentActivityName="com.example.app_10p5.MainActivite" > | 26 | android:parentActivityName="com.example.app_10p5.MainActivite" > |
24 | <meta-data | 27 | <meta-data |
25 | android:name="android.support.PARENT_ACTIVITY" | 28 | android:name="android.support.PARENT_ACTIVITY" |
26 | - android:value="com.example.app_10p5.MainActivite" /> | 29 | + android:value="com.example.app_10p5.MainActivite" |
30 | + android:resource="@xml/tech" /> | ||
31 | + <intent-filter> <!-- Prioritaire mais je n'ai pas réussi à le faire fonctionner --> | ||
32 | + <action android:name="android.nfc.action.NDEF_DISCOVERED"/> | ||
33 | + <category android:name="android.intent.category.DEFAULT"/> | ||
34 | + <data android:mimeType="text/plain" /> | ||
35 | + </intent-filter> | ||
36 | + <intent-filter> <!-- Regardé juste après les NDEF --> | ||
37 | + <action android:name="android.nfc.action.TECH_DISCOVERED"/> | ||
38 | + <category android:name="android.intent.category.DEFAULT"/> | ||
39 | + </intent-filter> | ||
27 | </activity> | 40 | </activity> |
28 | 41 | ||
29 | </application> | 42 | </application> |