merge in gingerbread-release history after reset to gingerbread
[android/platform/packages/apps/Tag.git] / AndroidManifest.xml
index 9d109ed..ecc63e3 100644 (file)
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.apps.tag"
-    android:versionCode="100"
-    android:versionName="1.0"
+    android:versionCode="101"
+    android:versionName="1.1"
 >
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
 
     <uses-feature android:name="android.hardware.nfc" required="true" />
@@ -33,6 +34,7 @@
     >
         <activity android:name="TagBrowserActivity"
             android:theme="@android:style/Theme.NoTitleBar"
+            android:screenOrientation="portrait"
         >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
         <activity android:name="TagList" />
 
+        <!-- TODO: lift the portrait restriction by re-working the list in the
+             layout. -->
+        <activity android:name="MyTagList"
+            android:screenOrientation="portrait" />
+
         <activity android:name="TagViewer"
             android:theme="@android:style/Theme.NoTitleBar"
             android:launchMode="singleTop"
         >
+            <!-- Catch the generic intent so we can display something for unknown tags -->
             <intent-filter>
-                <action android:name="android.nfc.action.NDEF_TAG_DISCOVERED"/>
+                <action android:name="android.nfc.action.TAG_DISCOVERED"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
 
+            <!-- Offer to display anything with NDEF data -->
+            <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"
+            />
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <data android:mimeType="vnd.android.cursor.item/ndef_msg"/>
             </intent-filter>
         </activity>
 
-        <activity android:name="MyTagActivity" android:label="@string/tab_my_tag">
-<!--
+        <!-- Make the activity show up as "My tag" when resolving intent -->
+        <activity android:name="EditTagActivity" android:label="@string/tab_my_tag">
             <intent-filter>
                 <action android:name="android.intent.action.SEND"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <data android:mimeType="text/plain" />
+                <data android:mimeType="text/x-vcard" />
             </intent-filter>
--->
         </activity>
 
+        <activity android:name="AboutActivity"
+            android:label=""
+            android:theme="@style/AboutTheme"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+        />
+
+        <activity android:name="WriteTagActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+        />
+
         <service android:name="TagService" />
 
         <provider android:name=".provider.TagProvider"