From 1d5707b5a864f5f154bc2de98f7c2027b8390387 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Tue, 12 Oct 2010 15:41:10 -0700 Subject: [PATCH 1/5] Update Tag app for API changes. Change-Id: Idecfee21ee58f7a19d5dcbae39c231b8e8d96095 Signed-off-by: Nick Pelly --- apps/Tag/src/com/android/apps/tag/NdefUtil.java | 12 ++++++------ apps/Tag/src/com/android/apps/tag/SaveTag.java | 16 ++++++++++++++-- .../android/apps/tag/TagBroadcastReceiver.java | 12 +++++++----- .../src/com/android/apps/tag/TagDBHelper.java | 8 ++++---- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/apps/Tag/src/com/android/apps/tag/NdefUtil.java b/apps/Tag/src/com/android/apps/tag/NdefUtil.java index 226597724..97222c731 100644 --- a/apps/Tag/src/com/android/apps/tag/NdefUtil.java +++ b/apps/Tag/src/com/android/apps/tag/NdefUtil.java @@ -22,8 +22,8 @@ import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.Iterables; import com.google.common.primitives.Bytes; -import com.trustedlogic.trustednfc.android.NdefMessage; -import com.trustedlogic.trustednfc.android.NdefRecord; +import android.nfc.NdefMessage; +import android.nfc.NdefRecord; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -105,8 +105,8 @@ public class NdefUtil { */ byte[] payload = Bytes.concat(new byte[] { 0x00 }, uriBytes); - return new NdefRecord(NdefRecord.TNF_WELL_KNOWN_TYPE, - NdefRecord.TYPE_URI, EMPTY, payload); + return new NdefRecord(NdefRecord.TNF_WELL_KNOWN, + NdefRecord.RTD_URI, EMPTY, payload); } /** @@ -122,8 +122,8 @@ public class NdefUtil { * record containing a URI. */ public static URI toURI(NdefRecord record) throws URISyntaxException { - Preconditions.checkArgument(record.getTnf() == NdefRecord.TNF_WELL_KNOWN_TYPE); - Preconditions.checkArgument(Arrays.equals(record.getType(), NdefRecord.TYPE_URI)); + Preconditions.checkArgument(record.getTnf() == NdefRecord.TNF_WELL_KNOWN); + Preconditions.checkArgument(Arrays.equals(record.getType(), NdefRecord.RTD_URI)); byte[] payload = record.getPayload(); diff --git a/apps/Tag/src/com/android/apps/tag/SaveTag.java b/apps/Tag/src/com/android/apps/tag/SaveTag.java index 5c007de1a..8b908cb27 100644 --- a/apps/Tag/src/com/android/apps/tag/SaveTag.java +++ b/apps/Tag/src/com/android/apps/tag/SaveTag.java @@ -23,6 +23,9 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; +import android.nfc.NdefMessage; +import android.nfc.NdefTag; +import android.nfc.NfcAdapter; import android.os.Bundle; import android.util.Log; import android.view.WindowManager; @@ -32,6 +35,7 @@ import android.widget.Toast; * An {@code Activity} which handles a broadcast of a new tag that the device just discovered. */ public class SaveTag extends Activity implements DialogInterface.OnClickListener { + private static final String TAG = "SaveTag"; @Override protected void onStart() { @@ -46,9 +50,17 @@ public class SaveTag extends Activity implements DialogInterface.OnClickListener ); showDialog(1); - NdefMessage msg = getIntent().getParcelableExtra(NfcManager.NDEF_MESSAGE_EXTRA); + NdefTag tag = getIntent().getParcelableExtra(NfcAdapter.EXTRA_TAG); + NdefMessage[] msgs = tag.getNdefMessages(); - String s = toHexString(msg.toByteArray()); + if (msgs.length == 0) { + Log.d(TAG, "No NDEF messages"); + return; + } + if (msgs.length > 1) { + Log.d(TAG, "Multiple NDEF messages, only saving first"); + } + String s = toHexString(msgs[0].toByteArray()); Log.d("SaveTag", s); Toast.makeText(this.getBaseContext(), "SaveTag: " + s, Toast.LENGTH_SHORT).show(); } diff --git a/apps/Tag/src/com/android/apps/tag/TagBroadcastReceiver.java b/apps/Tag/src/com/android/apps/tag/TagBroadcastReceiver.java index d576bdb19..b5ef1e740 100644 --- a/apps/Tag/src/com/android/apps/tag/TagBroadcastReceiver.java +++ b/apps/Tag/src/com/android/apps/tag/TagBroadcastReceiver.java @@ -19,8 +19,10 @@ package com.android.apps.tag; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.trustedlogic.trustednfc.android.NdefMessage; -import com.trustedlogic.trustednfc.android.NfcManager; +import android.nfc.NdefTag; + +import android.nfc.NdefMessage; +import android.nfc.NfcAdapter; /** * When we receive a new NDEF tag, start the activity to @@ -30,10 +32,10 @@ public class TagBroadcastReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(NfcManager.NDEF_TAG_DISCOVERED_ACTION)) { - NdefMessage msg = intent.getParcelableExtra(NfcManager.NDEF_MESSAGE_EXTRA); + if (intent.getAction().equals(NfcAdapter.ACTION_NDEF_TAG_DISCOVERED)) { + NdefTag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); Intent i = new Intent(context, SaveTag.class) - .putExtra(NfcManager.NDEF_MESSAGE_EXTRA, msg) + .putExtra(NfcAdapter.EXTRA_TAG, tag) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(i); } diff --git a/apps/Tag/src/com/android/apps/tag/TagDBHelper.java b/apps/Tag/src/com/android/apps/tag/TagDBHelper.java index 12a78b14d..5135d5008 100644 --- a/apps/Tag/src/com/android/apps/tag/TagDBHelper.java +++ b/apps/Tag/src/com/android/apps/tag/TagDBHelper.java @@ -17,9 +17,9 @@ package com.android.apps.tag; 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.nfc.NdefMessage; +import android.nfc.NdefRecord; +import android.nfc.FormatException; import android.content.Context; import android.database.sqlite.SQLiteDatabase; @@ -146,7 +146,7 @@ public class TagDBHelper extends SQLiteOpenHelper { // A real message obtained from an NFC Forum Type 4 tag. NdefMessage msg3 = new NdefMessage(REAL_NFC_MSG); insert(db, msg3, false); - } catch (NfcException e) { + } catch (FormatException e) { throw new RuntimeException(e); } } From a3dc45ac9f4c7e1bfa8a5084add450ab0712f117 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Tue, 12 Oct 2010 19:45:24 -0700 Subject: [PATCH 2/5] Fix build. Change-Id: I8e950c585ee9d5c97657ac17b00296423b1a8faa --- apps/Tag/src/com/android/apps/tag/NdefUtil.java | 4 ++-- apps/Tag/src/com/android/apps/tag/SaveTag.java | 3 --- apps/Tag/src/com/android/apps/tag/SmartPoster.java | 12 ++++++------ .../tests/src/com/android/apps/tag/NdefUtilTest.java | 4 ++-- .../src/com/android/apps/tag/SmartPosterTest.java | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/apps/Tag/src/com/android/apps/tag/NdefUtil.java b/apps/Tag/src/com/android/apps/tag/NdefUtil.java index 97222c731..87efb9e43 100644 --- a/apps/Tag/src/com/android/apps/tag/NdefUtil.java +++ b/apps/Tag/src/com/android/apps/tag/NdefUtil.java @@ -161,8 +161,8 @@ public class NdefUtil { * @return text payload. */ public static String toText(NdefRecord record) { - Preconditions.checkArgument(record.getTnf() == NdefRecord.TNF_WELL_KNOWN_TYPE); - Preconditions.checkArgument(Arrays.equals(record.getType(), NdefRecord.TYPE_TEXT)); + Preconditions.checkArgument(record.getTnf() == NdefRecord.TNF_WELL_KNOWN); + Preconditions.checkArgument(Arrays.equals(record.getType(), NdefRecord.RTD_TEXT)); try { byte[] payload = record.getPayload(); diff --git a/apps/Tag/src/com/android/apps/tag/SaveTag.java b/apps/Tag/src/com/android/apps/tag/SaveTag.java index 8b908cb27..6a5f66fcc 100644 --- a/apps/Tag/src/com/android/apps/tag/SaveTag.java +++ b/apps/Tag/src/com/android/apps/tag/SaveTag.java @@ -16,9 +16,6 @@ package com.android.apps.tag; -import com.trustedlogic.trustednfc.android.NdefMessage; -import com.trustedlogic.trustednfc.android.NfcManager; - import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; diff --git a/apps/Tag/src/com/android/apps/tag/SmartPoster.java b/apps/Tag/src/com/android/apps/tag/SmartPoster.java index 509da92aa..1e107235b 100644 --- a/apps/Tag/src/com/android/apps/tag/SmartPoster.java +++ b/apps/Tag/src/com/android/apps/tag/SmartPoster.java @@ -18,9 +18,9 @@ package com.android.apps.tag; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; -import com.trustedlogic.trustednfc.android.NdefMessage; -import com.trustedlogic.trustednfc.android.NdefRecord; -import com.trustedlogic.trustednfc.android.NfcException; +import android.nfc.NdefMessage; +import android.nfc.NdefRecord; +import android.nfc.FormatException; import javax.annotation.Nullable; import java.net.URI; @@ -67,8 +67,8 @@ public class SmartPoster { } public static SmartPoster from(NdefRecord record) { - Preconditions.checkArgument(record.getTnf() == NdefRecord.TNF_WELL_KNOWN_TYPE); - Preconditions.checkArgument(Arrays.equals(record.getType(), NdefRecord.TYPE_SMART_POSTER)); + Preconditions.checkArgument(record.getTnf() == NdefRecord.TNF_WELL_KNOWN); + Preconditions.checkArgument(Arrays.equals(record.getType(), NdefRecord.RTD_SMART_POSTER)); try { NdefMessage subRecords = new NdefMessage(record.getPayload()); URI uri = Iterables.getOnlyElement(NdefUtil.getURIs(subRecords)); @@ -79,7 +79,7 @@ public class SmartPoster { } return new SmartPoster(uri, title); - } catch (NfcException e) { + } catch (FormatException e) { throw new IllegalArgumentException(e); } } diff --git a/apps/Tag/tests/src/com/android/apps/tag/NdefUtilTest.java b/apps/Tag/tests/src/com/android/apps/tag/NdefUtilTest.java index ee6e56b7a..12baf6f9c 100644 --- a/apps/Tag/tests/src/com/android/apps/tag/NdefUtilTest.java +++ b/apps/Tag/tests/src/com/android/apps/tag/NdefUtilTest.java @@ -18,7 +18,7 @@ package com.android.apps.tag; import android.test.AndroidTestCase; import com.google.common.primitives.Bytes; -import com.trustedlogic.trustednfc.android.NdefRecord; +import android.nfc.NdefRecord; import java.io.UnsupportedEncodingException; @@ -45,7 +45,7 @@ public class NdefUtilTest extends AndroidTestCase { text ); - NdefRecord record = new NdefRecord(NdefRecord.TNF_WELL_KNOWN_TYPE, NdefRecord.TYPE_TEXT, new byte[0], data); + NdefRecord record = new NdefRecord(NdefRecord.TNF_WELL_KNOWN, NdefRecord.RTD_TEXT, new byte[0], data); assertEquals(word, NdefUtil.toText(record)); } } diff --git a/apps/Tag/tests/src/com/android/apps/tag/SmartPosterTest.java b/apps/Tag/tests/src/com/android/apps/tag/SmartPosterTest.java index 73039bd38..b7eb86973 100644 --- a/apps/Tag/tests/src/com/android/apps/tag/SmartPosterTest.java +++ b/apps/Tag/tests/src/com/android/apps/tag/SmartPosterTest.java @@ -17,7 +17,7 @@ package com.android.apps.tag; import android.test.AndroidTestCase; -import com.trustedlogic.trustednfc.android.NdefMessage; +import android.nfc.NdefMessage; /** * Tests for {@link SmartPoster}. From feb2b3d9b02d7fd008bea09d14f175d848a62226 Mon Sep 17 00:00:00 2001 From: Ben Komalo Date: Tue, 12 Oct 2010 20:51:06 -0700 Subject: [PATCH 3/5] Change date storage in DB to be a ms timestamp integral value. Add a basic CursorAdapter to add more flexibility to views in list. Create custom listview item that is pretty much the same, except with a relative time string. Change-Id: I9a1f956832f550b9a8192ea3967e732725dd6ba2 --- apps/Tag/res/layout/tag_list_item.xml | 40 +++++++++++++++++ .../android/apps/tag/TagCursorAdapter.java | 43 +++++++++++++++++++ .../src/com/android/apps/tag/TagDBHelper.java | 10 ++--- .../Tag/src/com/android/apps/tag/TagList.java | 10 ++--- 4 files changed, 91 insertions(+), 12 deletions(-) create mode 100644 apps/Tag/res/layout/tag_list_item.xml create mode 100644 apps/Tag/src/com/android/apps/tag/TagCursorAdapter.java diff --git a/apps/Tag/res/layout/tag_list_item.xml b/apps/Tag/res/layout/tag_list_item.xml new file mode 100644 index 000000000..cc984f545 --- /dev/null +++ b/apps/Tag/res/layout/tag_list_item.xml @@ -0,0 +1,40 @@ + + + + + + + + + + diff --git a/apps/Tag/src/com/android/apps/tag/TagCursorAdapter.java b/apps/Tag/src/com/android/apps/tag/TagCursorAdapter.java new file mode 100644 index 000000000..a658268e6 --- /dev/null +++ b/apps/Tag/src/com/android/apps/tag/TagCursorAdapter.java @@ -0,0 +1,43 @@ +// Copyright 2010 Google Inc. All Rights Reserved. + +package com.android.apps.tag; + +import android.content.Context; +import android.database.Cursor; +import android.text.format.DateUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Adapter; +import android.widget.CursorAdapter; +import android.widget.TextView; + +/** + * A custom {@link Adapter} that renders tag entries for a list. + */ +public class TagCursorAdapter extends CursorAdapter { + + private final LayoutInflater mInflater; + + public TagCursorAdapter(Context context, Cursor c) { + super(context, c); + + mInflater = LayoutInflater.from(context); + } + + @Override + public void bindView(View view, Context context, Cursor cursor) { + TextView mainLine = (TextView) view.findViewById(R.id.title); + TextView dateLine = (TextView) view.findViewById(R.id.date); + + // TODO(benkomalo): either write a cursor abstraction, or use constants for column indices. + mainLine.setText(cursor.getString(cursor.getColumnIndex("bytes"))); + dateLine.setText(DateUtils.getRelativeTimeSpanString( + context, cursor.getLong(cursor.getColumnIndex("date")))); + } + + @Override + public View newView(Context context, Cursor cursor, ViewGroup parent) { + return mInflater.inflate(R.layout.tag_list_item, null); + } +} diff --git a/apps/Tag/src/com/android/apps/tag/TagDBHelper.java b/apps/Tag/src/com/android/apps/tag/TagDBHelper.java index 5135d5008..06fa9e001 100644 --- a/apps/Tag/src/com/android/apps/tag/TagDBHelper.java +++ b/apps/Tag/src/com/android/apps/tag/TagDBHelper.java @@ -17,14 +17,14 @@ package com.android.apps.tag; import com.google.common.annotations.VisibleForTesting; -import android.nfc.NdefMessage; -import android.nfc.NdefRecord; -import android.nfc.FormatException; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteStatement; +import android.nfc.FormatException; +import android.nfc.NdefMessage; +import android.nfc.NdefRecord; import java.net.URI; import java.util.Date; @@ -39,7 +39,7 @@ public class TagDBHelper extends SQLiteOpenHelper { private static final String NDEF_MSG = "create table NdefMessage (" + "_id INTEGER NOT NULL, " + "bytes BLOB NOT NULL, " - + "date TEXT NOT NULL, " + + "date INTEGER NOT NULL, " + "saved TEXT NOT NULL default 0," // boolean + "PRIMARY KEY(_id)" + ")"; @@ -154,7 +154,7 @@ public class TagDBHelper extends SQLiteOpenHelper { private void insert(SQLiteDatabase db, NdefMessage msg, boolean isSaved) { SQLiteStatement stmt = db.compileStatement(INSERT); stmt.bindString(1, new String(msg.toByteArray())); // TODO: This should be a blob - stmt.bindString(2, new Date().toString()); + stmt.bindLong(2, System.currentTimeMillis()); String isSavedStr = isSaved ? "1" : "0"; stmt.bindString(3, isSavedStr); stmt.executeInsert(); diff --git a/apps/Tag/src/com/android/apps/tag/TagList.java b/apps/Tag/src/com/android/apps/tag/TagList.java index 5ca1a63c8..369ef6557 100644 --- a/apps/Tag/src/com/android/apps/tag/TagList.java +++ b/apps/Tag/src/com/android/apps/tag/TagList.java @@ -43,19 +43,15 @@ public class TagList extends ListActivity implements DialogInterface.OnClickList boolean showSavedOnly = getIntent().getBooleanExtra(SHOW_SAVED_ONLY, false); db = new TagDBHelper(getBaseContext()).getReadableDatabase(); String selection = showSavedOnly ? "saved=1" : null; + + // TODO: Use an AsyncQueryHandler so that DB queries are not done on UI thread. cursor = db.query( "NdefMessage", new String[] { "_id", "bytes", "date" }, selection, null, null, null, null); - SimpleCursorAdapter sca = - new SimpleCursorAdapter(this, - android.R.layout.two_line_list_item, - cursor, - new String[] { "bytes", "date" }, - new int[] { android.R.id.text1, android.R.id.text2 }); - setListAdapter(sca); + setListAdapter(new TagCursorAdapter(this, cursor)); registerForContextMenu(getListView()); } From 9e914e4aa2075a38d76048261808a9a3a3036eb5 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 13 Oct 2010 13:38:45 -0700 Subject: [PATCH 4/5] Reorder the samples packaging + readme. Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177 --- build/sdk.atree | 31 +++++++++++++++++-------------- samples/README | 5 +++++ 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 samples/README diff --git a/build/sdk.atree b/build/sdk.atree index 376592943..cb15d5a95 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -140,33 +140,36 @@ frameworks/base/docs/docs-samples-redirect.html docs/samples/index.html # # the list here should match the list of samples that we generate docs for, # (see web_docs_sample_code_flags in frameworks/base/Android.mk) -development/samples/source.properties samples/${PLATFORM_NAME}/source.properties development/apps/GestureBuilder samples/${PLATFORM_NAME}/GestureBuilder +development/samples/source.properties samples/${PLATFORM_NAME}/source.properties +# +# PLEASE KEEP THE SAMPLES IN ALPHABETICAL ORDER. +# development/samples/AccessibilityService samples/${PLATFORM_NAME}/AccessibilityService -development/samples/BluetoothChat samples/${PLATFORM_NAME}/BluetoothChat -development/samples/Home samples/${PLATFORM_NAME}/Home -development/samples/LunarLander samples/${PLATFORM_NAME}/LunarLander -development/samples/NotePad samples/${PLATFORM_NAME}/NotePad development/samples/ApiDemos samples/${PLATFORM_NAME}/ApiDemos development/samples/BackupRestore samples/${PLATFORM_NAME}/BackupRestore +development/samples/BluetoothChat samples/${PLATFORM_NAME}/BluetoothChat +development/samples/ContactManager samples/${PLATFORM_NAME}/ContactManager +development/samples/CrossCompatibility samples/${PLATFORM_NAME}/CrossCompatibility +development/samples/CubeLiveWallpaper samples/${PLATFORM_NAME}/CubeLiveWallpaper development/samples/HeavyWeight samples/${PLATFORM_NAME}/HeavyWeight +development/samples/Home samples/${PLATFORM_NAME}/Home +development/samples/JetBoy samples/${PLATFORM_NAME}/JetBoy +development/samples/LunarLander samples/${PLATFORM_NAME}/LunarLander +development/samples/MultiResolution samples/${PLATFORM_NAME}/MultiResolution +development/samples/NotePad samples/${PLATFORM_NAME}/NotePad development/samples/SampleSyncAdapter samples/${PLATFORM_NAME}/SampleSyncAdapter +development/samples/SearchableDictionary samples/${PLATFORM_NAME}/SearchableDictionary development/samples/SkeletonApp samples/${PLATFORM_NAME}/SkeletonApp development/samples/Snake samples/${PLATFORM_NAME}/Snake development/samples/SoftKeyboard samples/${PLATFORM_NAME}/SoftKeyboard -development/samples/JetBoy samples/${PLATFORM_NAME}/JetBoy -development/samples/SearchableDictionary samples/${PLATFORM_NAME}/SearchableDictionary development/samples/Spinner samples/${PLATFORM_NAME}/Spinner development/samples/SpinnerTest samples/${PLATFORM_NAME}/SpinnerTest -development/samples/ContactManager samples/${PLATFORM_NAME}/ContactManager -development/samples/MultiResolution samples/${PLATFORM_NAME}/MultiResolution -development/samples/Wiktionary samples/${PLATFORM_NAME}/Wiktionary -development/samples/WiktionarySimple samples/${PLATFORM_NAME}/WiktionarySimple -development/samples/CubeLiveWallpaper samples/${PLATFORM_NAME}/CubeLiveWallpaper -development/samples/VoiceRecognitionService samples/${PLATFORM_NAME}/VoiceRecognitionService development/samples/TicTacToeLib samples/${PLATFORM_NAME}/TicTacToeLib development/samples/TicTacToeMain samples/${PLATFORM_NAME}/TicTacToeMain -development/samples/CrossCompatibility samples/${PLATFORM_NAME}/CrossCompatibility +development/samples/VoiceRecognitionService samples/${PLATFORM_NAME}/VoiceRecognitionService +development/samples/Wiktionary samples/${PLATFORM_NAME}/Wiktionary +development/samples/WiktionarySimple samples/${PLATFORM_NAME}/WiktionarySimple # NOTICE files are copied by build/core/Makefile from sdk.git sdk/files/sdk_files_NOTICE.txt samples/${PLATFORM_NAME}/NOTICE.txt diff --git a/samples/README b/samples/README new file mode 100644 index 000000000..818104013 --- /dev/null +++ b/samples/README @@ -0,0 +1,5 @@ +Adding a new folder in development/samples is not enough to have it +be packaged with the SDK. + +Make sure to edit development/build/sdk.atree to add the sample to the SDK +build. \ No newline at end of file From 4ddc85ac9da73899dc3a33e289daf51a14f6c69c Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 13 Oct 2010 15:36:48 -0700 Subject: [PATCH 5/5] Move GB SDK components to 2.3 Change-Id: I1bcd6063d6702f397909d5212b9d0ccb1869f33b --- sdk/doc_source.properties | 4 ++-- sdk/platform_source.properties | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/doc_source.properties b/sdk/doc_source.properties index 69d50d381..4418853cd 100644 --- a/sdk/doc_source.properties +++ b/sdk/doc_source.properties @@ -1,5 +1,5 @@ Pkg.UserSrc=false Pkg.Revision=1 -AndroidVersion.ApiLevel=8 -AndroidVersion.CodeName=gingerbread +AndroidVersion.ApiLevel=9 +#AndroidVersion.CodeName= diff --git a/sdk/platform_source.properties b/sdk/platform_source.properties index 7abd7a32c..6dadea50e 100644 --- a/sdk/platform_source.properties +++ b/sdk/platform_source.properties @@ -1,6 +1,6 @@ -Pkg.Desc=Android SDK Platform 2.x_r1 +Pkg.Desc=Android SDK Platform 2.3_r1 Pkg.UserSrc=false -Platform.Version=2.x +Platform.Version=2.3 Pkg.Revision=1 -AndroidVersion.ApiLevel=8 -AndroidVersion.CodeName=gingerbread +AndroidVersion.ApiLevel=9 +#AndroidVersion.CodeName=