コミット: 06bef9df0b13209e1c6b40709f6a9a976f58e230 - development (git)

development

コミットメタ情報

• リビジョン: 06bef9df0b13209e1c6b40709f6a9a976f58e230 (tree)
• 日時: 2011-01-26 07:44:37
• 作者: Jeff Hamilton <jham@andr...>
• コミッター: Android Git Automerger

ログメッセージ

am 7a11acd9: am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.

* commit '7a11acd92bec5e7a089bdb248a78589491962c76':

Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.

変更サマリ

• modified: samples/ApiDemos/AndroidManifest.xml
• add: samples/ApiDemos/res/xml/filter_nfc.xml
• modified: samples/ApiDemos/src/com/example/android/apis/nfc/ForegroundDispatch.java
• add: samples/ApiDemos/src/com/example/android/apis/nfc/TechFilter.java

差分

--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -2454,6 +2454,22 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".nfc.TechFilter" android:label="NFC/TechFilter">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+
+            <!-- Add a technology filter -->
+            <intent-filter>
+                <action android:name="android.nfc.action.TECH_DISCOVERED" />
+            </intent-filter>
+
+            <meta-data android:name="android.nfc.action.TECH_DISCOVERED"
+                android:resource="@xml/filter_nfc"
+            />
+        </activity>
+
     </application>
 
     <instrumentation android:name=".app.LocalSampleInstrumentation"

--- /dev/null
+++ b/samples/ApiDemos/res/xml/filter_nfc.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- capture anything using NfcF -->
+    <tech-list>
+        <tech>android.nfc.tech.NfcF</tech>
+    </tech-list>
+
+    <!-- capture all MIFARE Classics with NDEF payloads -->
+    <tech-list>
+        <tech>android.nfc.tech.NfcA</tech>
+        <tech>android.nfc.tech.MifareClassic</tech>
+        <tech>android.nfc.tech.Ndef</tech>
+    </tech-list>
+</resources>

--- a/samples/ApiDemos/src/com/example/android/apis/nfc/ForegroundDispatch.java
+++ b/samples/ApiDemos/src/com/example/android/apis/nfc/ForegroundDispatch.java
@@ -24,17 +24,20 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.IntentFilter.MalformedMimeTypeException;
 import android.nfc.NfcAdapter;
+import android.nfc.tech.NfcF;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.TextView;
 
 /**
- * An example of how to use the NFC foreground dispatch APIs.
+ * An example of how to use the NFC foreground dispatch APIs. This will intercept any MIME data
+ * based NDEF dispatch as well as all dispatched for NfcF tags.
  */
 public class ForegroundDispatch extends Activity {
     private NfcAdapter mAdapter;
     private PendingIntent mPendingIntent;
     private IntentFilter[] mFilters;
+    private String[][] mTechLists;
     private TextView mText;
     private int mCount = 0;
 
@@ -54,26 +57,25 @@ public class ForegroundDispatch extends Activity {
         mPendingIntent = PendingIntent.getActivity(this, 0,
                 new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
 
-        // Setup intent filters for all types of NFC dispatches to intercept all discovered tags
+        // Setup an intent filter for all MIME based dispatches
         IntentFilter ndef = new IntentFilter(NfcAdapter.ACTION_NDEF_DISCOVERED);
         try {
             ndef.addDataType("*/*");
         } catch (MalformedMimeTypeException e) {
             throw new RuntimeException("fail", e);
         }
-        IntentFilter tech = new IntentFilter(NfcAdapter.ACTION_TECHNOLOGY_DISCOVERED);
-        tech.addDataScheme("vnd.android.nfc"); 
         mFilters = new IntentFilter[] {
                 ndef,
-                tech,
-                new IntentFilter(NfcAdapter.ACTION_TAG_DISCOVERED),
         };
+
+        // Setup a tech list for all NfcF tags
+        mTechLists = new String[][] { new String[] { NfcF.class.getName() } };
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        mAdapter.enableForegroundDispatch(this, mPendingIntent, mFilters);
+        mAdapter.enableForegroundDispatch(this, mPendingIntent, mFilters, mTechLists);
     }
 
     @Override

--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/nfc/TechFilter.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.example.android.apis.nfc;
+
+import com.example.android.apis.R;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.nfc.NfcAdapter;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class TechFilter extends Activity {
+    private TextView mText;
+    private int mCount = 0;
+
+    @Override
+    public void onCreate(Bundle savedState) {
+        super.onCreate(savedState);
+
+        setContentView(R.layout.foreground_dispatch);
+        mText = (TextView) findViewById(R.id.text);
+
+        Intent intent = getIntent();
+        String action = intent.getAction();
+        if (NfcAdapter.ACTION_TECHNOLOGY_DISCOVERED.equals(action)) {
+            mText.setText("Discovered tag " + ++mCount + " with intent: " + intent);
+        } else {
+            mText.setText("Scan a tag");
+        }
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        mText.setText("Discovered tag " + ++mCount + " with intent: " + intent);
+    }
+}