LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 5b2f2912: Nuke author tags and update Manifest that I accidentally left out of the previous CL.

Browse Source 
Merge commit '5b2f2912bcf4c1a9da9e8120d2788e31b484a848' into gingerbread-plus-aosp

* commit '5b2f2912bcf4c1a9da9e8120d2788e31b484a848':
  Nuke author tags and update Manifest that I
This commit is contained in:
Ben Komalo
2010-10-12 17:16:24 -07:00
committed by Android Git Automerger
parent c3fd52ed00 5b2f2912bc
commit 1d583d99cf
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/Tag/AndroidManifest.xml
View File

@@ -22,7 +22,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.apps.tag">
<application android:label="Tags">
<activity android:name="Tags" android:icon="@drawable/ic_launcher_nfc">
<activity android:name="TagBrowserActivity" android:icon="@drawable/ic_launcher_nfc">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>

1
apps/Tag/src/com/android/apps/tag/SaveTag.java
View File

@@ -30,7 +30,6 @@ import android.widget.Toast;
/**
* An {@code Activity} which handles a broadcast of a new tag that the device just discovered.
* @author nnk@google.com (Nick Kralevich)
*/
public class SaveTag extends Activity implements DialogInterface.OnClickListener {

11
apps/Tag/src/com/android/apps/tag/TagDBHelper.java
View File

@@ -16,20 +16,21 @@
package com.android.apps.tag;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteStatement;
import com.google.common.annotations.VisibleForTesting;
import com.trustedlogic.trustednfc.android.NdefMessage;
import com.trustedlogic.trustednfc.android.NdefRecord;
import com.trustedlogic.trustednfc.android.NfcException;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteStatement;
import java.net.URI;
import java.util.Date;
/**
* @author nnk@google.com (Nick Kralevich)
* Database utilities for the saved tags.
*/
public class TagDBHelper extends SQLiteOpenHelper {

1
apps/Tag/src/com/android/apps/tag/TagList.java
View File

@@ -30,7 +30,6 @@ import android.widget.SimpleCursorAdapter;
/**
* An {@code Activity} that displays a flat list of tags that can be "opened".
* @author nnk@google.com (Nick Kralevich)
*/
public class TagList extends ListActivity implements DialogInterface.OnClickListener {
private SQLiteDatabase db;