OSDN Git Service
Xavier Ducrohet [Fri, 11 Dec 2009 03:54:51 +0000 (19:54 -0800)]
am
79ace486: am
7579e4af: Merge change I9fb303e6 into eclair
Merge commit '
79ace48637207ba918a19d55acd9eeda700ff203' into eclair-mr2-plus-aosp
* commit '
79ace48637207ba918a19d55acd9eeda700ff203':
Add new samples to the SDK.
Roman Nurik [Fri, 11 Dec 2009 03:54:47 +0000 (19:54 -0800)]
am
70634b36: am
e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit '
70634b3633dc2847df14db67a4e22dce5a16e45f' into eclair-mr2-plus-aosp
* commit '
70634b3633dc2847df14db67a4e22dce5a16e45f':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Xavier Ducrohet [Fri, 11 Dec 2009 03:48:51 +0000 (19:48 -0800)]
am
7579e4af: Merge change I9fb303e6 into eclair
Merge commit '
7579e4afcff771ed7e137b46bd019acd581c9568' into eclair-mr2
* commit '
7579e4afcff771ed7e137b46bd019acd581c9568':
Add new samples to the SDK.
Roman Nurik [Fri, 11 Dec 2009 03:48:38 +0000 (19:48 -0800)]
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-mr2
* commit '
e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Trevor Johns [Fri, 11 Dec 2009 01:51:34 +0000 (17:51 -0800)]
am
5f6b6bfb: am
0359bdb7: Merge change I2b0bb983 into eclair
Merge commit '
5f6b6bfb881601bdcb65c274449ffad08df5b29b' into eclair-mr2-plus-aosp
* commit '
5f6b6bfb881601bdcb65c274449ffad08df5b29b':
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
David 'Digit' Turner [Fri, 11 Dec 2009 01:51:30 +0000 (17:51 -0800)]
am
04df8565: am
1fd97693: Merge change Ia13e890e into eclair
Merge commit '
04df8565bf8f2b81a632fcd736cb96c8da478b9e' into eclair-mr2-plus-aosp
* commit '
04df8565bf8f2b81a632fcd736cb96c8da478b9e':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Trevor Johns [Fri, 11 Dec 2009 01:44:35 +0000 (17:44 -0800)]
am
0359bdb7: Merge change I2b0bb983 into eclair
Merge commit '
0359bdb72f3da3f319d0b3ef87a70c4f98d4154f' into eclair-mr2
* commit '
0359bdb72f3da3f319d0b3ef87a70c4f98d4154f':
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
David 'Digit' Turner [Fri, 11 Dec 2009 01:40:07 +0000 (17:40 -0800)]
am
1fd97693: Merge change Ia13e890e into eclair
Merge commit '
1fd97693dc03fac4e189e5361a7ac7ee033caff2' into eclair-mr2
* commit '
1fd97693dc03fac4e189e5361a7ac7ee033caff2':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Tom O'Neill [Fri, 11 Dec 2009 01:21:48 +0000 (17:21 -0800)]
am
036832ad: Merge change Ic944ab1e into eclair-mr2
Merge commit '
036832adba9d953f8d34ece1bd5b049f02437928' into eclair-mr2-plus-aosp
* commit '
036832adba9d953f8d34ece1bd5b049f02437928':
Extract and check in NotepadCodeLab.zip for change tracking
Android (Google) Code Review [Fri, 11 Dec 2009 01:16:32 +0000 (17:16 -0800)]
Merge change Ic944ab1e into eclair-mr2
* changes:
Extract and check in NotepadCodeLab.zip for change tracking
Android (Google) Code Review [Fri, 11 Dec 2009 01:12:47 +0000 (17:12 -0800)]
Merge change I9fb303e6 into eclair
* changes:
Add new samples to the SDK.
Romain Guy [Fri, 11 Dec 2009 00:58:46 +0000 (16:58 -0800)]
am
dcf99fbe: Merge change If4ff28ed into eclair-mr2
Merge commit '
dcf99fbe7ac981c4ef3c8def65213e148281547a' into eclair-mr2-plus-aosp
* commit '
dcf99fbe7ac981c4ef3c8def65213e148281547a':
Cleanup one of the ListView sample demos.
Trevor Johns [Fri, 11 Dec 2009 00:55:06 +0000 (16:55 -0800)]
am
4eb4ed2d: am
bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
Merge commit '
4eb4ed2d19c498998bb9560c71873fa6657d0644' into eclair-mr2-plus-aosp
* commit '
4eb4ed2d19c498998bb9560c71873fa6657d0644':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
Xavier Ducrohet [Fri, 11 Dec 2009 00:54:52 +0000 (16:54 -0800)]
Add new samples to the SDK.
Change-Id: I9fb303e6b6f6fb00172f4f5bf64a2c56649c2491
Android (Google) Code Review [Fri, 11 Dec 2009 00:51:41 +0000 (16:51 -0800)]
Merge change If4ff28ed into eclair-mr2
* changes:
Cleanup one of the ListView sample demos.
Trevor Johns [Fri, 11 Dec 2009 00:45:44 +0000 (16:45 -0800)]
am
bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
Merge commit '
bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-mr2
* commit '
bba4ff7c38e7e6837fabdb225cdb24d12a17eabc':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
Romain Guy [Thu, 10 Dec 2009 23:19:03 +0000 (15:19 -0800)]
Cleanup one of the ListView sample demos.
Tom O'Neill [Wed, 9 Dec 2009 23:41:05 +0000 (15:41 -0800)]
Extract and check in NotepadCodeLab.zip for change tracking
The 3-part Notepad tutorial is currently only available in the zip archive
frameworks/base/docs/html/guide/tutorials/notepad/codelab/NotepadCodeLab.zip.
This CL adds the uncompressed code to the repository so that there is a
paper trail of future changes to the code.
Roman Nurik [Thu, 10 Dec 2009 17:43:24 +0000 (09:43 -0800)]
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Android (Google) Code Review [Thu, 10 Dec 2009 02:07:31 +0000 (18:07 -0800)]
Merge change I2b0bb983 into eclair
* changes:
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
Android (Google) Code Review [Thu, 10 Dec 2009 00:02:14 +0000 (16:02 -0800)]
Merge change Ia13e890e into eclair
* changes:
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Grace Kloba [Thu, 10 Dec 2009 00:01:30 +0000 (16:01 -0800)]
am
2c0f89aa: Update SampleBrowserPlugin to show handling long press and double tap events.
Merge commit '
2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5' into eclair-mr2-plus-aosp
* commit '
2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5':
Update SampleBrowserPlugin to show handling
Jack Palevich [Wed, 9 Dec 2009 23:59:16 +0000 (15:59 -0800)]
am
3c31d6cd: Simple Matrix Palette skinning sample.
Merge commit '
3c31d6cded51b6e6719b0052ec9987ca7218c868' into eclair-mr2-plus-aosp
* commit '
3c31d6cded51b6e6719b0052ec9987ca7218c868':
Simple Matrix Palette skinning sample.
Jack Palevich [Wed, 9 Dec 2009 23:59:12 +0000 (15:59 -0800)]
am
5dc44989: Add OpenGL ES 2.0 sample.
Merge commit '
5dc449896cb596159652d15e7333d74e53601609' into eclair-mr2-plus-aosp
* commit '
5dc449896cb596159652d15e7333d74e53601609':
Add OpenGL ES 2.0 sample.
Trevor Johns [Wed, 9 Dec 2009 23:56:43 +0000 (15:56 -0800)]
am
37fbca22: am
5865825d: Merge change Iabe9529e into eclair
Merge commit '
37fbca223a683b1d914b7b26eaf79da6c29aa113' into eclair-mr2-plus-aosp
* commit '
37fbca223a683b1d914b7b26eaf79da6c29aa113':
Adding ContactManager sample to SDK samples.
Scott Main [Wed, 9 Dec 2009 23:55:47 +0000 (15:55 -0800)]
am
441b80ab: am
6b4bd260: Merge change I1cd5c828 into eclair
Merge commit '
441b80ab3795cb9f02afa7a7397dccd7c17c0cdd' into eclair-mr2-plus-aosp
* commit '
441b80ab3795cb9f02afa7a7397dccd7c17c0cdd':
change the way bytes are read from InputStream.
James Yum [Wed, 9 Dec 2009 23:54:38 +0000 (15:54 -0800)]
am
1b5a89a2: am
d2962a33: TextToSpeech API demo.
Merge commit '
1b5a89a2041586eba7211e996d4de9a5300e8b2d' into eclair-mr2-plus-aosp
* commit '
1b5a89a2041586eba7211e996d4de9a5300e8b2d':
TextToSpeech API demo.
Nicolas Catania [Wed, 9 Dec 2009 23:47:48 +0000 (15:47 -0800)]
am
863270d1: Merge change I5ba25302 into eclair-mr2
Merge commit '
863270d143ab4d496029f8417094187061e74ef2' into eclair-mr2-plus-aosp
* commit '
863270d143ab4d496029f8417094187061e74ef2':
Added the new phone app unittest to runtest.
David 'Digit' Turner [Wed, 9 Dec 2009 23:46:07 +0000 (15:46 -0800)]
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Derek Sollenberger [Wed, 9 Dec 2009 23:44:43 +0000 (15:44 -0800)]
am
e8454e79: updating sample plugin to use new full screen interfaces.
Merge commit '
e8454e7969c4bc34d6f4a98ff27ffbf8dde20e4f' into eclair-mr2-plus-aosp
* commit '
e8454e7969c4bc34d6f4a98ff27ffbf8dde20e4f':
updating sample plugin to use new full screen interfaces.
Dianne Hackborn [Wed, 9 Dec 2009 23:41:08 +0000 (15:41 -0800)]
am
579c7f19: Reorganize Service API demos.
Merge commit '
579c7f19ac379294822b976b73fe4037f40eba82' into eclair-mr2-plus-aosp
* commit '
579c7f19ac379294822b976b73fe4037f40eba82':
Reorganize Service API demos.
Andrew Stadler [Wed, 9 Dec 2009 20:07:31 +0000 (12:07 -0800)]
resolved conflicts for merge of
fa3d6b54 to eclair-mr2-plus-aosp
Trevor Johns [Tue, 8 Dec 2009 01:04:53 +0000 (17:04 -0800)]
Importing Wikitionary/SimpleWiktionary sample code from 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.
Grace Kloba [Wed, 9 Dec 2009 08:13:05 +0000 (00:13 -0800)]
Update SampleBrowserPlugin to show handling
long press and double tap events.
Jack Palevich [Wed, 9 Dec 2009 07:32:35 +0000 (15:32 +0800)]
Simple Matrix Palette skinning sample.
Jack Palevich [Fri, 27 Nov 2009 11:54:46 +0000 (19:54 +0800)]
Add OpenGL ES 2.0 sample.
This sample renders a textured triangle using OpenGL ES 2.0.
If OpenGL ES 2.0 is not available, the sample falls back to
using OpenGL ES 1.0.
Trevor Johns [Wed, 9 Dec 2009 07:23:53 +0000 (23:23 -0800)]
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
ContactsContract.Contacts._ID.
Trevor Johns [Wed, 9 Dec 2009 01:53:44 +0000 (17:53 -0800)]
am
5865825d: Merge change Iabe9529e into eclair
Merge commit '
5865825df6792f1cf6a5f70911f5ad15a2a243b8' into eclair-mr2
* commit '
5865825df6792f1cf6a5f70911f5ad15a2a243b8':
Adding ContactManager sample to SDK samples.
Android (Google) Code Review [Wed, 9 Dec 2009 01:50:19 +0000 (17:50 -0800)]
Merge change Iabe9529e into eclair
* changes:
Adding ContactManager sample to SDK samples.
Trevor Johns [Tue, 24 Nov 2009 13:16:35 +0000 (05:16 -0800)]
Adding ContactManager sample to SDK samples.
This sample demonstrates use of the ContactsContract classes introduced in API Level 5.
Scott Main [Wed, 9 Dec 2009 00:47:50 +0000 (16:47 -0800)]
am
6b4bd260: Merge change I1cd5c828 into eclair
Merge commit '
6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3' into eclair-mr2
* commit '
6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3':
change the way bytes are read from InputStream.
Android (Google) Code Review [Wed, 9 Dec 2009 00:44:40 +0000 (16:44 -0800)]
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.
Scott Main [Tue, 8 Dec 2009 22:50:17 +0000 (14:50 -0800)]
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.
James Yum [Wed, 9 Dec 2009 00:13:06 +0000 (16:13 -0800)]
am
d2962a33: TextToSpeech API demo.
Merge commit '
d2962a33216ce40a526c80fc8865cf9bd04936f4' into eclair-mr2
* commit '
d2962a33216ce40a526c80fc8865cf9bd04936f4':
TextToSpeech API demo.
Android (Google) Code Review [Tue, 8 Dec 2009 18:49:26 +0000 (10:49 -0800)]
Merge change I5ba25302 into eclair-mr2
* changes:
Added the new phone app unittest to runtest.
Derek Sollenberger [Mon, 7 Dec 2009 21:31:54 +0000 (16:31 -0500)]
updating sample plugin to use new full screen interfaces.
Nicolas Catania [Mon, 7 Dec 2009 21:03:13 +0000 (13:03 -0800)]
Added the new phone app unittest to runtest.
Used phone-unit for the test name because 'phone'
is already taken by a package under '/vendor'.
James Yum [Thu, 3 Dec 2009 01:10:20 +0000 (17:10 -0800)]
TextToSpeech API demo.
Dianne Hackborn [Fri, 4 Dec 2009 23:31:04 +0000 (15:31 -0800)]
Reorganize Service API demos.
This collapses multiple related files in one, to make it easier to deal
with in documentation and elsewhere.
Megha Joshi [Tue, 8 Dec 2009 01:03:40 +0000 (17:03 -0800)]
am
0cf6092e: am
11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '
0cf6092e742fbf95722e596f0d4e808e87ac6ce2' into eclair-mr2-plus-aosp
* commit '
0cf6092e742fbf95722e596f0d4e808e87ac6ce2':
Add QuickContactsBadge widget sample to ApiDemos
Android (Google) Code Review [Tue, 8 Dec 2009 00:59:07 +0000 (16:59 -0800)]
Merge change Ifc1b1ccb into eclair-mr2
* changes:
Fix eclipse build
Megha Joshi [Tue, 8 Dec 2009 00:59:00 +0000 (16:59 -0800)]
am
11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '
11d89599ef7cf949bfe0048d1352f264ee0f6a34' into eclair-mr2
* commit '
11d89599ef7cf949bfe0048d1352f264ee0f6a34':
Add QuickContactsBadge widget sample to ApiDemos
Megha Joshi [Fri, 13 Nov 2009 19:45:19 +0000 (11:45 -0800)]
Add QuickContactsBadge widget sample to ApiDemos
Marco Nelissen [Tue, 8 Dec 2009 00:02:40 +0000 (16:02 -0800)]
am
bd642f3e: Make the simulator use alsa instead of esound.
Merge commit '
bd642f3e94f4cb94cbb48646ae61da5f6b18a093' into eclair-mr2-plus-aosp
* commit '
bd642f3e94f4cb94cbb48646ae61da5f6b18a093':
Make the simulator use alsa instead of esound.
Marco Nelissen [Fri, 4 Dec 2009 23:50:25 +0000 (15:50 -0800)]
Make the simulator use alsa instead of esound.
Andrew Stadler [Mon, 7 Dec 2009 18:55:39 +0000 (10:55 -0800)]
Fix eclipse build
* Bring in auto-generated EventLogTags
Owen Lin [Mon, 7 Dec 2009 08:04:49 +0000 (00:04 -0800)]
am
0ee41ccc: Merge change I1558a070 into eclair-mr2
Merge commit '
0ee41ccc1429b83c6ab62cb99e081826a94741e8' into eclair-mr2-plus-aosp
* commit '
0ee41ccc1429b83c6ab62cb99e081826a94741e8':
Fix the camera preview demo.
Android (Google) Code Review [Mon, 7 Dec 2009 08:00:07 +0000 (00:00 -0800)]
Merge change I1558a070 into eclair-mr2
* changes:
Fix the camera preview demo.
David 'Digit' Turner [Sat, 5 Dec 2009 02:31:25 +0000 (18:31 -0800)]
am
85f5c420: am
e8d64956: Merge change I6b913ab8 into eclair
Merge commit '
85f5c42069ab6ae90d1ed1c04f22a7b42407e55d' into eclair-mr2-plus-aosp
* commit '
85f5c42069ab6ae90d1ed1c04f22a7b42407e55d':
Fix toolchain scripts for Darwin and Cygwin.
David 'Digit' Turner [Sat, 5 Dec 2009 02:27:05 +0000 (18:27 -0800)]
am
e8d64956: Merge change I6b913ab8 into eclair
Merge commit '
e8d649561a6dbc6e0260d4b24049c00d23e7285b' into eclair-mr2
* commit '
e8d649561a6dbc6e0260d4b24049c00d23e7285b':
Fix toolchain scripts for Darwin and Cygwin.
Android (Google) Code Review [Sat, 5 Dec 2009 02:22:21 +0000 (18:22 -0800)]
Merge change I6b913ab8 into eclair
* changes:
Fix toolchain scripts for Darwin and Cygwin.
David 'Digit' Turner [Sat, 5 Dec 2009 01:57:36 +0000 (17:57 -0800)]
Fix toolchain scripts for Darwin and Cygwin.
Only touches download-toolchain-sources.sh and build-toolchain.sh
This does not impact the NDK build scripts themselves and is only
needed to properly package NDK release packages.
Megha Joshi [Sat, 5 Dec 2009 01:10:40 +0000 (17:10 -0800)]
am
2321ba48: am
b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit '
2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83' into eclair-mr2-plus-aosp
* commit '
2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83':
Adding wallpaper sample in ApiDemos.
Megha Joshi [Sat, 5 Dec 2009 01:06:39 +0000 (17:06 -0800)]
am
b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit '
b49dd8359d1b23eb527139499c0db58cb01466c6' into eclair-mr2
* commit '
b49dd8359d1b23eb527139499c0db58cb01466c6':
Adding wallpaper sample in ApiDemos.
Megha Joshi [Thu, 3 Dec 2009 21:56:04 +0000 (13:56 -0800)]
Adding wallpaper sample in ApiDemos.
Marco Nelissen [Fri, 4 Dec 2009 22:48:27 +0000 (14:48 -0800)]
am
ac2a5cf7: Fix fake timing.
Merge commit '
ac2a5cf7e45a2fa7936119517e4f52517b9d5747' into eclair-mr2-plus-aosp
* commit '
ac2a5cf7e45a2fa7936119517e4f52517b9d5747':
Fix fake timing.
Marco Nelissen [Fri, 4 Dec 2009 22:44:43 +0000 (14:44 -0800)]
Fix fake timing.
Scott Main [Fri, 4 Dec 2009 02:24:44 +0000 (18:24 -0800)]
am
2eaa8880: am
c5a640ee: Merge change Icce4f510 into eclair
Merge commit '
2eaa8880f076ebd0db36de81f9feaf34bd571df3' into eclair-mr2-plus-aosp
* commit '
2eaa8880f076ebd0db36de81f9feaf34bd571df3':
change BT sample minsdkversion to 6 because it
Scott Main [Fri, 4 Dec 2009 02:14:59 +0000 (18:14 -0800)]
am
c5a640ee: Merge change Icce4f510 into eclair
Merge commit '
c5a640ee3aba8c3215a769a11492a4dc8d82bd72' into eclair-mr2
* commit '
c5a640ee3aba8c3215a769a11492a4dc8d82bd72':
change BT sample minsdkversion to 6 because it
Android (Google) Code Review [Fri, 4 Dec 2009 02:07:52 +0000 (18:07 -0800)]
Merge change Icce4f510 into eclair
* changes:
change BT sample minsdkversion to 6 because it uses the revised result codes when enabling BT
Scott Main [Fri, 4 Dec 2009 01:59:47 +0000 (17:59 -0800)]
change BT sample minsdkversion to 6 because it
uses the revised result codes when enabling BT
Andrew Stadler [Fri, 4 Dec 2009 01:05:38 +0000 (17:05 -0800)]
am
21b8dbe5: Merge change Ia8c35b58 into eclair-mr2
Merge commit '
21b8dbe5c4f657f673bae2b1ad298f91465616d2' into eclair-mr2-plus-aosp
* commit '
21b8dbe5c4f657f673bae2b1ad298f91465616d2':
Track library changes
Android (Google) Code Review [Fri, 4 Dec 2009 01:00:05 +0000 (17:00 -0800)]
Merge change Ia8c35b58 into eclair-mr2
* changes:
Track library changes
Jean-Baptiste Queru [Fri, 4 Dec 2009 00:57:41 +0000 (16:57 -0800)]
am
aecf2c65: am
76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '
aecf2c6581228677e90550a6d8f5f9668fb72987' into eclair-mr2-plus-aosp
* commit '
aecf2c6581228677e90550a6d8f5f9668fb72987':
Revert "adding set wallpaper sample code in ApiDemos."
Megha Joshi [Fri, 4 Dec 2009 00:53:33 +0000 (16:53 -0800)]
am
f6d9c9d4: am
eb34b45e: Revert "fixing build"
Merge commit '
f6d9c9d427c70017757dcddf5b396de2d5f2f33d' into eclair-mr2-plus-aosp
* commit '
f6d9c9d427c70017757dcddf5b396de2d5f2f33d':
Revert "fixing build"
Jean-Baptiste Queru [Fri, 4 Dec 2009 00:43:32 +0000 (16:43 -0800)]
am
76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '
76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a' into eclair-mr2
* commit '
76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a':
Revert "adding set wallpaper sample code in ApiDemos."
Megha Joshi [Fri, 4 Dec 2009 00:42:00 +0000 (16:42 -0800)]
Megha Joshi [Fri, 4 Dec 2009 00:41:05 +0000 (16:41 -0800)]
am
b4fe143c: am
b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit '
b4fe143cfe18022653fc6710ba44a8f19c6b17ed' into eclair-mr2-plus-aosp
* commit '
b4fe143cfe18022653fc6710ba44a8f19c6b17ed':
adding set wallpaper sample code in ApiDemos.
Jean-Baptiste Queru [Fri, 4 Dec 2009 00:35:23 +0000 (16:35 -0800)]
Revert "adding set wallpaper sample code in ApiDemos."
This reverts commit
b5ad157bab0298535fa09378f6aca47029f9f475.
Xavier Ducrohet [Fri, 4 Dec 2009 00:34:13 +0000 (16:34 -0800)]
am
92fd5c63: am
06ddeb0f: Move source prop files for docs/platforms/usb driver back into dev.
Merge commit '
92fd5c635776f520ce09daf6681025a5f29aafbb' into eclair-mr2-plus-aosp
* commit '
92fd5c635776f520ce09daf6681025a5f29aafbb':
Move source prop files for docs/platforms/usb driver back into dev.
Megha Joshi [Fri, 4 Dec 2009 00:29:58 +0000 (16:29 -0800)]
am
eb34b45e: Revert "fixing build"
Merge commit '
eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd' into eclair-mr2
* commit '
eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd':
Revert "fixing build"
Scott Main [Fri, 4 Dec 2009 00:28:34 +0000 (16:28 -0800)]
am
43bba677: am
67203cca: add new Bluetooth sample app
Merge commit '
43bba677c9f8de4ad01c17387c56e9a1e91fa175' into eclair-mr2-plus-aosp
* commit '
43bba677c9f8de4ad01c17387c56e9a1e91fa175':
add new Bluetooth sample app
Megha Joshi [Fri, 4 Dec 2009 00:16:52 +0000 (16:16 -0800)]
Revert "fixing build"
This reverts commit
7d1b833e7d1337e9ce85746886bafc98bcab16d8.
Andrew Stadler [Thu, 3 Dec 2009 23:35:07 +0000 (15:35 -0800)]
Track library changes
Fixes build errors in eclipse around CalendarProvider
Megha Joshi [Thu, 3 Dec 2009 23:23:37 +0000 (15:23 -0800)]
Megha Joshi [Thu, 3 Dec 2009 21:56:04 +0000 (13:56 -0800)]
fixing build
Megha Joshi [Thu, 3 Dec 2009 22:17:55 +0000 (14:17 -0800)]
am
b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit '
b5ad157bab0298535fa09378f6aca47029f9f475' into eclair-mr2
* commit '
b5ad157bab0298535fa09378f6aca47029f9f475':
adding set wallpaper sample code in ApiDemos.
Megha Joshi [Thu, 3 Dec 2009 21:56:04 +0000 (13:56 -0800)]
adding set wallpaper sample code in ApiDemos.
Xavier Ducrohet [Thu, 3 Dec 2009 19:50:21 +0000 (11:50 -0800)]
am
06ddeb0f: Move source prop files for docs/platforms/usb driver back into dev.
Merge commit '
06ddeb0fbd7bd514b17fbb335d5e5e1eeb19397a' into eclair-mr2
* commit '
06ddeb0fbd7bd514b17fbb335d5e5e1eeb19397a':
Move source prop files for docs/platforms/usb driver back into dev.
Xavier Ducrohet [Thu, 3 Dec 2009 03:10:10 +0000 (19:10 -0800)]
Move source prop files for docs/platforms/usb driver back into dev.
Change-Id: I4632dc69432b720d586c84834f89c843a2eaf5cd
Scott Main [Thu, 3 Dec 2009 18:23:30 +0000 (10:23 -0800)]
am
67203cca: add new Bluetooth sample app
Merge commit '
67203cca65901d672803071bfc026c3657b85fdf' into eclair-mr2
* commit '
67203cca65901d672803071bfc026c3657b85fdf':
add new Bluetooth sample app
Scott Main [Tue, 1 Dec 2009 07:20:55 +0000 (23:20 -0800)]
add new Bluetooth sample app
Xavier Ducrohet [Wed, 2 Dec 2009 21:13:05 +0000 (13:13 -0800)]
am
b06a8a0c: am
5c52358c: Merge change I8404ae5f into eclair
Merge commit '
b06a8a0ca04d7900042410b4be0cf9cdfda24f18' into eclair-mr2-plus-aosp
* commit '
b06a8a0ca04d7900042410b4be0cf9cdfda24f18':
Move some scripts that were in development/tools/scripts back in this project
Xavier Ducrohet [Wed, 2 Dec 2009 21:13:01 +0000 (13:13 -0800)]
am
6be8bb5f: am
86cd8059: Merge change Ia7f1d23e into eclair
Merge commit '
6be8bb5f2a3d59805419db427124ec0cca34c996' into eclair-mr2-plus-aosp
* commit '
6be8bb5f2a3d59805419db427124ec0cca34c996':
Update sdk build to use the new folders in sdk/
Xavier Ducrohet [Wed, 2 Dec 2009 21:05:27 +0000 (13:05 -0800)]
am
5c52358c: Merge change I8404ae5f into eclair
Merge commit '
5c52358c9b0a95adc0fe8b383289e7e522b2c421' into eclair-mr2
* commit '
5c52358c9b0a95adc0fe8b383289e7e522b2c421':
Move some scripts that were in development/tools/scripts back in this project
Xavier Ducrohet [Wed, 2 Dec 2009 21:05:21 +0000 (13:05 -0800)]
am
86cd8059: Merge change Ia7f1d23e into eclair
Merge commit '
86cd8059dec97e2c1f1797d1e179719561d05162' into eclair-mr2
* commit '
86cd8059dec97e2c1f1797d1e179719561d05162':
Update sdk build to use the new folders in sdk/
Android (Google) Code Review [Wed, 2 Dec 2009 21:00:08 +0000 (13:00 -0800)]
Merge change I8404ae5f into eclair
* changes:
Move some scripts that were in development/tools/scripts back in this project
Android (Google) Code Review [Wed, 2 Dec 2009 20:59:48 +0000 (12:59 -0800)]
Merge change Ia7f1d23e into eclair
* changes:
Update sdk build to use the new folders in sdk/
Xavier Ducrohet [Wed, 2 Dec 2009 18:01:09 +0000 (10:01 -0800)]
am
7271d158: am
bc9cac17: Make Gesturebuilder build like a sample.
Merge commit '
7271d15820302b982f1f704661ff78ac094096b5' into eclair-mr2-plus-aosp
* commit '
7271d15820302b982f1f704661ff78ac094096b5':
Make Gesturebuilder build like a sample.
Xavier Ducrohet [Wed, 2 Dec 2009 17:48:15 +0000 (09:48 -0800)]
am
bc9cac17: Make Gesturebuilder build like a sample.
Merge commit '
bc9cac171505afbf4ecdb5eabb849c98cac1bddc' into eclair-mr2
* commit '
bc9cac171505afbf4ecdb5eabb849c98cac1bddc':
Make Gesturebuilder build like a sample.
OSDN Git Service
