James Yum
a88a8393c6
am 40e665a0: cleanup
...
Merge commit '40e665a015c67a8dd21838894a1634a3e101b760' into eclair-plus-aosp
* commit '40e665a015c67a8dd21838894a1634a3e101b760':
cleanup
2010-02-10 13:01:55 -08:00
James Yum
40e665a015
cleanup
...
deleted: licensing/ILicenseResultListener.aidl
deleted: licensing/ILicensingService.aidl
deleted: licensing/LicenseChecker.java
deleted: licensing/LicenseCheckerCallback.java
deleted: licensing/LicenseValidator.java
deleted: licensing/Policy.java
deleted: licensing/ResponseData.java
deleted: licensing/StrictPolicy.java
2010-02-10 11:18:23 -08:00
Dirk Dougherty
2a589050ef
am 4389d65c: Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
...
Merge commit '4389d65caea762b276b1b7d6fd560f4b2c4370b3' into eclair-plus-aosp
* commit '4389d65caea762b276b1b7d6fd560f4b2c4370b3':
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
2010-02-09 18:42:38 -08:00
Dirk Dougherty
658d86e5be
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
...
Change-Id: I149fb2aab91d0a2dfc4242a85118bf20dea97e42
2010-02-09 18:00:44 -08:00
The Android Open Source Project
609329541a
merge from open-source master
2010-02-05 13:51:37 -08:00
Megha Joshi
74ccbf7aa7
am ca7a9d34: Merge "SampleSyncAdapter sample code." into eclair
...
Merge commit 'ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1' into eclair-plus-aosp
* commit 'ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1':
SampleSyncAdapter sample code.
2010-02-03 12:29:01 -08:00
Megha Joshi
ca7a9d3497
Merge "SampleSyncAdapter sample code." into eclair
2010-02-03 12:24:47 -08:00
Megha Joshi
00bf0f0296
SampleSyncAdapter sample code.
2010-02-01 15:44:47 -08:00
James Yum
a3c89d73bd
am b8168f27: Merge "Market licensing server library core." into eclair
...
Merge commit 'b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2' into eclair-plus-aosp
* commit 'b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2':
Market licensing server library core.
2010-01-28 10:51:19 -08:00
James Yum
b8168f27f6
Merge "Market licensing server library core." into eclair
2010-01-28 10:36:53 -08:00
Romain Guy
0c823a12e5
Add uses-feature for live wallpaper sample.
2010-01-28 07:30:54 -08:00
James Yum
f32f3b5e7b
Market licensing server library core.
...
new file: ILicenseResultListener.aidl
new file: ILicensingService.aidl
new file: LicenseChecker.java
new file: LicenseCheckerCallback.java
new file: Policy.java
new file: ResponseData.java
new file: StrictPolicy.java
new file: LicenseValidator.java
2010-01-27 18:51:48 -08:00
Romain Guy
9c5363b081
am 897af093: Add uses-feature for live wallpaper sample.
...
Merge commit '897af09372ca7c95db6c12554d9ff6fcec81ad58' into eclair-plus-aosp
* commit '897af09372ca7c95db6c12554d9ff6fcec81ad58':
Add uses-feature for live wallpaper sample.
2010-01-27 17:04:23 -08:00
Romain Guy
897af09372
Add uses-feature for live wallpaper sample.
...
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
2010-01-27 16:55:38 -08:00
Dirk Dougherty
07b5c3bdb7
am c220077d: Merge "SDK doc change: Misc fixes." into eclair
...
Merge commit 'c220077d52972356ff30d46d47def7669731f0d7' into eclair-plus-aosp
* commit 'c220077d52972356ff30d46d47def7669731f0d7':
SDK doc change: Misc fixes.
2010-01-22 16:49:51 -08:00
Dirk Dougherty
c220077d52
Merge "SDK doc change: Misc fixes." into eclair
2010-01-22 16:45:03 -08:00
Dirk Dougherty
e096b94573
SDK doc change: Misc fixes.
...
Bug: 2160782
Change-Id: I44d1d9687df45dae40a6922a37e6b410cc2de835
2010-01-22 15:18:15 -08:00
Xavier Ducrohet
7ae4c4026a
am 2f2fb96b: Make the SDK packaging put the samples in the root folder.
...
Merge commit '2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp
* commit '2f2fb96b4b037a016336a98e3b637f4394e1f323':
Make the SDK packaging put the samples in the root folder.
2010-01-12 12:46:21 -08:00
Xavier Ducrohet
2f2fb96b4b
Make the SDK packaging put the samples in the root folder.
...
Change-Id: Icb88f88d503de9690ba210c0bfabdc0598021860
2010-01-12 12:32:12 -08:00
Trevor Johns
7b48a6463f
am c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
...
Merge commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193' into eclair-plus-aosp
* commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193':
Adding index file for BusinessCard sample. This will be displayed in the HTML
2010-01-11 14:05:34 -08:00
Trevor Johns
f44d1b040f
Adding index file for BusinessCard sample. This will be displayed in the HTML
...
documentation when this sample is selected via the Resource tab.
2010-01-11 11:59:10 -08:00
Dirk Dougherty
e897c1b428
am 1d151678: Merge change Ie8650e4b into eclair
...
Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp
* commit '1d15167865b22730cf6ba314a057e62f960aa1db':
sdk doc change for esr: fix some broken links to resources files.
2009-12-15 19:26:25 -08:00
Android (Google) Code Review
1d15167865
Merge change Ie8650e4b into eclair
...
* changes:
sdk doc change for esr: fix some broken links to resources files.
2009-12-15 19:23:33 -08:00
Dirk Dougherty
0b1153b115
sdk doc change for esr: fix some broken links to resources files.
...
Bug: 2160782
Change-Id: Ie8650e4b642a96e67a2e7e62669282bc58d414ba
2009-12-15 18:47:00 -08:00
Trevor Johns
55d80586c7
am 5dba584a: Merge change Ic3464854 into eclair
...
Merge commit '5dba584a08e6d2d5c84ca971b796e053995e4214' into eclair-plus-aosp
* commit '5dba584a08e6d2d5c84ca971b796e053995e4214':
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
2009-12-15 12:17:03 -08:00
Android (Google) Code Review
5dba584a08
Merge change Ic3464854 into eclair
...
* changes:
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
2009-12-15 12:13:54 -08:00
Xavier Ducrohet
cf4e98b260
am b84cf9e1: Clean up the SDK and make it compiled and installed in the SDK system image.
...
Merge commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b' into eclair-plus-aosp
* commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b':
Clean up the SDK and make it compiled and installed in the SDK system image.
2009-12-15 10:33:08 -08:00
Trevor Johns
0ed0224e24
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
2009-12-14 23:25:59 -08:00
Xavier Ducrohet
b84cf9e1e3
Clean up the SDK and make it compiled and installed in the SDK system image.
...
Change-Id: I6e5f01a1cc45beada70608307f4ac38a4dcdd0b9
2009-12-14 22:36:44 -08:00
Roman Nurik
aa89e73699
am e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
...
Merge commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9' into eclair-plus-aosp
* commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
2009-12-10 17:06:41 -08:00
Roman Nurik
e7e7a6b821
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
2009-12-10 09:43:24 -08:00
Trevor Johns
a6db4b4643
am 0359bdb7: Merge change I2b0bb983 into eclair
...
Merge commit '0359bdb72f3da3f319d0b3ef87a70c4f98d4154f' into eclair-plus-aosp
* commit '0359bdb72f3da3f319d0b3ef87a70c4f98d4154f':
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/ .
2009-12-09 18:12:09 -08:00
Android (Google) Code Review
0359bdb72f
Merge change I2b0bb983 into eclair
...
* changes:
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/ .
2009-12-09 18:07:31 -08:00
Trevor Johns
807dc15b09
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/ .
...
Original code by Jeffrey Sharkey <jsharkey@android.com >.
Modifications:
- Remove .classpath, .project, and default.properties.
- Remove generated files (/gen).
- Create Android.mk and _index.html.
- Cleaned up whitespace and converted to match AOSP style guide.
- Renamed SimpleWiktionary to WiktionarySimple to keep both samples next to each other in the
directory listing.
- Removed the android:text attribute in the BulletPoint due to localization issues.
2009-12-09 11:35:26 -08:00
Trevor Johns
8759e2f036
am bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
...
Merge commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-plus-aosp
* commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
2009-12-09 11:28:35 -08:00
Trevor Johns
bba4ff7c38
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
...
ContactsContract.Contacts._ID.
2009-12-08 23:23:53 -08:00
Trevor Johns
d1d19baf0c
am 5865825d: Merge change Iabe9529e into eclair
...
Merge commit '5865825df6792f1cf6a5f70911f5ad15a2a243b8' into eclair-plus-aosp
* commit '5865825df6792f1cf6a5f70911f5ad15a2a243b8':
Adding ContactManager sample to SDK samples.
2009-12-08 17:54:10 -08:00
Android (Google) Code Review
5865825df6
Merge change Iabe9529e into eclair
...
* changes:
Adding ContactManager sample to SDK samples.
2009-12-08 17:50:19 -08:00
Trevor Johns
c6d634b850
Adding ContactManager sample to SDK samples.
...
This sample demonstrates use of the ContactsContract classes introduced in API Level 5.
2009-12-08 16:51:39 -08:00
Scott Main
c984764ff6
am 6b4bd260: Merge change I1cd5c828 into eclair
...
Merge commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3' into eclair-plus-aosp
* commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3':
change the way bytes are read from InputStream.
2009-12-08 16:47:21 -08:00
Android (Google) Code Review
6b4bd26058
Merge change I1cd5c828 into eclair
...
* changes:
change the way bytes are read from InputStream. Read only the bytes received and don't allocate new arrays Also revise the mechanism for writing the outgoing messages to the screen to be more consistent with reading and cleanup line lengths to be <100 chars.
2009-12-08 16:44:40 -08:00
Scott Main
25b6aed7b2
change the way bytes are read from InputStream.
...
Read only the bytes received and don't allocate new arrays
Also revise the mechanism for writing the outgoing messages
to the screen to be more consistent with reading and
cleanup line lengths to be <100 chars.
2009-12-08 16:29:51 -08:00
James Yum
8ac07a902d
am d2962a33: TextToSpeech API demo.
...
Merge commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4' into eclair-plus-aosp
* commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4':
TextToSpeech API demo.
2009-12-08 16:13:51 -08:00
James Yum
d2962a3321
TextToSpeech API demo.
2009-12-07 18:35:56 -08:00
Megha Joshi
b3ed38b90e
am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
...
Merge commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34' into eclair-plus-aosp
* commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34':
Add QuickContactsBadge widget sample to ApiDemos
2009-12-07 16:59:39 -08:00
Megha Joshi
11d89599ef
Add QuickContactsBadge widget sample to ApiDemos
2009-12-07 16:53:24 -08:00
Megha Joshi
5bd13f2f4e
am b49dd835: Adding wallpaper sample in ApiDemos.
...
Merge commit 'b49dd8359d1b23eb527139499c0db58cb01466c6' into eclair-plus-aosp
* commit 'b49dd8359d1b23eb527139499c0db58cb01466c6':
Adding wallpaper sample in ApiDemos.
2009-12-04 17:06:09 -08:00
Megha Joshi
b49dd8359d
Adding wallpaper sample in ApiDemos.
2009-12-04 17:00:21 -08:00
Scott Main
20d2781801
am c5a640ee: Merge change Icce4f510 into eclair
...
Merge commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72' into eclair-plus-aosp
* commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72':
change BT sample minsdkversion to 6 because it
2009-12-03 18:15:33 -08:00
Scott Main
cce4f51025
change BT sample minsdkversion to 6 because it
...
uses the revised result codes when enabling BT
2009-12-03 17:59:47 -08:00