am dbb9a2fd: Merge "cleanup unused classes, show date in tag list." into gingerbread

Merge commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee' into gingerbread-plus-aosp

* commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee':
  cleanup unused classes, show date in tag list.
This commit is contained in:
Nick Kralevich
2010-10-12 11:23:27 -07:00
committed by Android Git Automerger
4 changed files with 3 additions and 135 deletions

View File

@@ -29,7 +29,6 @@
</intent-filter>
</activity>
<activity android:name="TagSelector"></activity>
<activity android:name="TagList"></activity>
<activity android:name="SaveTag"></activity>
<receiver android:name=".TagBroadcastReceiver">

View File

@@ -42,13 +42,13 @@ public class TagList extends ListActivity implements DialogInterface.OnClickList
Toast.makeText(getBaseContext(), "entered method", Toast.LENGTH_SHORT).show();
db = new TagDBHelper(getBaseContext()).getReadableDatabase();
cursor = db.query("NdefMessage", new String[] { "_id", "bytes" }, null, null, null, null, null);
cursor = db.query("NdefMessage", new String[] { "_id", "bytes", "date" }, null, null, null, null, null);
SimpleCursorAdapter sca =
new SimpleCursorAdapter(this,
android.R.layout.two_line_list_item,
cursor,
new String[] { "bytes" },
new int[] { android.R.id.text1 });
new String[] { "bytes", "date" },
new int[] { android.R.id.text1, android.R.id.text2 });
setListAdapter(sca);
registerForContextMenu(getListView());

View File

@@ -1,64 +0,0 @@
/*
* Copyright (C) 2010 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.
*/
package com.android.apps.tag;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.TextView;
/**
* @author nnk@google.com (Nick Kralevich)
*/
public class TagListAdapter extends BaseAdapter {
private Context context;
TagListAdapter(Context context) {
this.context = context;
}
private static final String[] listItems = {
"Welcome! T2000 Festival",
"Free songs by Hula 88",
"Welcome to FreeBucks",
"BooBox Movie Coupons"
};
@Override
public int getCount() {
return listItems.length;
}
@Override
public String getItem(int position) {
return listItems[position];
}
@Override
public long getItemId(int position) {
return position;
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
TextView tv = new TextView(context);
tv.setText(getItem(position));
return tv;
}
}

View File

@@ -1,67 +0,0 @@
/*
* Copyright (C) 2010 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.
*/
package com.android.apps.tag;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
/**
* A minimal "Hello, World!" application.
*/
public class TagSelector extends Activity {
private static final int DIALOG = 1;
private static final String[] elements = { "hello world" };
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final TextView tv = new TextView(this);
tv.setText("hello world");
tv.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
tv.setText("clicked!");
showAlert();
}
});
setContentView(tv);
// Set the layout for this activity. You can find it
// in res/layout/hello_activity.xml
// setContentView(R.layout.hello_activity);
}
@Override
protected Dialog onCreateDialog(int id, Bundle bundle) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Welcome ");
builder.setCancelable(true);
builder.setItems(elements, null);
return builder.create();
}
private void showAlert() {
showDialog(DIALOG);
}
}