OSDN Git Service
Xavier Ducrohet [Mon, 11 Jan 2010 20:07:57 +0000 (12:07 -0800)]
am
ef54fe9a: Fix compilation error by declaring stride before the first goto
Merge commit '
ef54fe9aaab4124e61850062d2212b20c20c8ea5' into eclair-plus-aosp
* commit '
ef54fe9aaab4124e61850062d2212b20c20c8ea5':
Fix compilation error by declaring stride before the first goto
Xavier Ducrohet [Mon, 11 Jan 2010 20:00:41 +0000 (12:00 -0800)]
Fix compilation error by declaring stride before the first goto
Change-Id: I242601038dc7290eac0e4745abaa1ec35d859c09
Jack Palevich [Sun, 10 Jan 2010 05:54:20 +0000 (21:54 -0800)]
am
a8ba4a0e: Merge "Add the tool etc1tool to the sdk." into eclair
Merge commit '
a8ba4a0e361b44dd5edf954a8b088b310023eb3b' into eclair-plus-aosp
* commit '
a8ba4a0e361b44dd5edf954a8b088b310023eb3b':
Add the tool etc1tool to the sdk.
Jack Palevich [Sun, 10 Jan 2010 05:54:17 +0000 (21:54 -0800)]
am
84d83ba8: Merge "DO NOT MERGE Tool for compressing/decompressing ETC1 textures." into eclair
Merge commit '
84d83ba81b076cc6234e3fc92b8367b89fab5561' into eclair-plus-aosp
* commit '
84d83ba81b076cc6234e3fc92b8367b89fab5561':
DO NOT MERGE Tool for compressing/decompressing ETC1 textures.
Jack Palevich [Sun, 10 Jan 2010 05:51:27 +0000 (21:51 -0800)]
Merge "Add the tool etc1tool to the sdk." into eclair
Jack Palevich [Sun, 10 Jan 2010 05:51:15 +0000 (21:51 -0800)]
Merge "DO NOT MERGE Tool for compressing/decompressing ETC1 textures." into eclair
Ying Wang [Sat, 9 Jan 2010 02:42:58 +0000 (18:42 -0800)]
am
7e3d6785: Fixes bug of the number of injected monkey events.
Merge commit '
7e3d678570d9e9849a249476275fec0a4bb1be1e' into eclair-plus-aosp
* commit '
7e3d678570d9e9849a249476275fec0a4bb1be1e':
Fixes bug of the number of injected monkey events.
Ying Wang [Tue, 29 Dec 2009 23:41:09 +0000 (15:41 -0800)]
Fixes bug of the number of injected monkey events.
Returns the actual events number that has been injected,
if any system error has occurred.
Jack Palevich [Fri, 8 Jan 2010 07:56:34 +0000 (15:56 +0800)]
Add the tool etc1tool to the sdk.
etc1tool is a command line tool for compressing and decompressing
ETC1 textures. This texture format is commonly supported by OpenGL
ES 2.0 GPUs.
Jack Palevich [Fri, 8 Jan 2010 06:52:08 +0000 (14:52 +0800)]
DO NOT MERGE Tool for compressing/decompressing ETC1 textures.
The ETC1 texture format is commonly supported by
OpenGL ES 2.0-capable GPUs.
For historical reasons ETC1 texture files have the
default extension .PKM
This tool relies on the libETC1 library to
compress and decompress the image data.
Ying Wang [Wed, 6 Jan 2010 21:44:28 +0000 (13:44 -0800)]
am
9c7692aa: Set ro.monkey if it\'s not set yet.
Merge commit '
9c7692aabbf28554810f440fc7ff60fc9c335dc9' into eclair-plus-aosp
* commit '
9c7692aabbf28554810f440fc7ff60fc9c335dc9':
Set ro.monkey if it's not set yet.
Ying Wang [Wed, 6 Jan 2010 18:16:55 +0000 (10:16 -0800)]
Set ro.monkey if it's not set yet.
http://b/issue?id=
1681101
Ying Wang [Mon, 4 Jan 2010 20:58:44 +0000 (12:58 -0800)]
am
48f0d899: Annouce that Monkey is running.
Merge commit '
48f0d8993b5e871dd2695e983266aa655801769e' into eclair-plus-aosp
* commit '
48f0d8993b5e871dd2695e983266aa655801769e':
Annouce that Monkey is running.
Ying Wang [Wed, 30 Dec 2009 22:37:04 +0000 (14:37 -0800)]
Annouce that Monkey is running.
http://b/issue?id=
1681101
Dirk Dougherty [Wed, 16 Dec 2009 03:26:25 +0000 (19:26 -0800)]
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.
Android (Google) Code Review [Wed, 16 Dec 2009 03:23:33 +0000 (19:23 -0800)]
Merge change Ie8650e4b into eclair
* changes:
sdk doc change for esr: fix some broken links to resources files.
Dirk Dougherty [Wed, 16 Dec 2009 02:47:00 +0000 (18:47 -0800)]
sdk doc change for esr: fix some broken links to resources files.
Bug:
2160782
Change-Id: Ie8650e4b642a96e67a2e7e62669282bc58d414ba
Trevor Johns [Tue, 15 Dec 2009 20:17:03 +0000 (12:17 -0800)]
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.
Android (Google) Code Review [Tue, 15 Dec 2009 20:13:54 +0000 (12:13 -0800)]
Merge change Ic3464854 into eclair
* changes:
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
Xavier Ducrohet [Tue, 15 Dec 2009 18:33:08 +0000 (10:33 -0800)]
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.
Xavier Ducrohet [Tue, 15 Dec 2009 15:42:50 +0000 (07:42 -0800)]
am
1162372c: Use the feature list for the SDK.
Merge commit '
1162372c9e7ff4b6e60d247fb057b47f571af86f' into eclair-plus-aosp
* commit '
1162372c9e7ff4b6e60d247fb057b47f571af86f':
Use the feature list for the SDK.
Trevor Johns [Tue, 15 Dec 2009 07:25:00 +0000 (23:25 -0800)]
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
Xavier Ducrohet [Tue, 15 Dec 2009 06:34:06 +0000 (22:34 -0800)]
Clean up the SDK and make it compiled and installed in the SDK system image.
Change-Id: I6e5f01a1cc45beada70608307f4ac38a4dcdd0b9
Xavier Ducrohet [Tue, 15 Dec 2009 02:01:14 +0000 (18:01 -0800)]
Use the feature list for the SDK.
Change-Id: I926a682ac23a373276d10223af9f1e47ebc617d0
vchtchetkine [Fri, 11 Dec 2009 21:34:42 +0000 (13:34 -0800)]
am
2276398d: Merge change I0d9344aa into eclair
Merge commit '
2276398db0b0208b7627dc436ecc9e6c09e68107' into eclair-plus-aosp
* commit '
2276398db0b0208b7627dc436ecc9e6c09e68107':
Fixed
Android (Google) Code Review [Fri, 11 Dec 2009 21:29:37 +0000 (13:29 -0800)]
Merge change I0d9344aa into eclair
* changes:
Fixed
vchtchetkine [Fri, 11 Dec 2009 15:14:38 +0000 (07:14 -0800)]
Fixed
Xavier Ducrohet [Fri, 11 Dec 2009 01:16:53 +0000 (17:16 -0800)]
am
7579e4af: Merge change I9fb303e6 into eclair
Merge commit '
7579e4afcff771ed7e137b46bd019acd581c9568' into eclair-plus-aosp
* commit '
7579e4afcff771ed7e137b46bd019acd581c9568':
Add new samples to the SDK.
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.
Roman Nurik [Fri, 11 Dec 2009 01:06:41 +0000 (17:06 -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-plus-aosp
* commit '
e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Xavier Ducrohet [Fri, 11 Dec 2009 00:54:52 +0000 (16:54 -0800)]
Add new samples to the SDK.
Change-Id: I9fb303e6b6f6fb00172f4f5bf64a2c56649c2491
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.
Trevor Johns [Thu, 10 Dec 2009 02:12:09 +0000 (18:12 -0800)]
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/.
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/.
David 'Digit' Turner [Thu, 10 Dec 2009 00:07:36 +0000 (16:07 -0800)]
am
1fd97693: Merge change Ia13e890e into eclair
Merge commit '
1fd97693dc03fac4e189e5361a7ac7ee033caff2' into eclair-plus-aosp
* commit '
1fd97693dc03fac4e189e5361a7ac7ee033caff2':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
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.
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.
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.
Trevor Johns [Wed, 9 Dec 2009 19:28:35 +0000 (11:28 -0800)]
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
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:54:10 +0000 (17:54 -0800)]
am
5865825d: Merge change Iabe9529e into eclair
Merge commit '
5865825df6792f1cf6a5f70911f5ad15a2a243b8' into eclair-plus-aosp
* 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:21 +0000 (16:47 -0800)]
am
6b4bd260: Merge change I1cd5c828 into eclair
Merge commit '
6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3' into eclair-plus-aosp
* 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:51 +0000 (16:13 -0800)]
am
d2962a33: TextToSpeech API demo.
Merge commit '
d2962a33216ce40a526c80fc8865cf9bd04936f4' into eclair-plus-aosp
* commit '
d2962a33216ce40a526c80fc8865cf9bd04936f4':
TextToSpeech API demo.
James Yum [Thu, 3 Dec 2009 01:10:20 +0000 (17:10 -0800)]
TextToSpeech API demo.
Megha Joshi [Tue, 8 Dec 2009 00:59:39 +0000 (16:59 -0800)]
am
11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '
11d89599ef7cf949bfe0048d1352f264ee0f6a34' into eclair-plus-aosp
* 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
David 'Digit' Turner [Sat, 5 Dec 2009 02:26:23 +0000 (18:26 -0800)]
am
e8d64956: Merge change I6b913ab8 into eclair
Merge commit '
e8d649561a6dbc6e0260d4b24049c00d23e7285b' into eclair-plus-aosp
* 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:06:09 +0000 (17:06 -0800)]
am
b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit '
b49dd8359d1b23eb527139499c0db58cb01466c6' into eclair-plus-aosp
* 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.
Scott Main [Fri, 4 Dec 2009 02:15:33 +0000 (18:15 -0800)]
am
c5a640ee: Merge change Icce4f510 into eclair
Merge commit '
c5a640ee3aba8c3215a769a11492a4dc8d82bd72' into eclair-plus-aosp
* 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
Jean-Baptiste Queru [Fri, 4 Dec 2009 00:44:41 +0000 (16:44 -0800)]
am
76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '
76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a' into eclair-plus-aosp
* commit '
76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a':
Revert "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.
Megha Joshi [Fri, 4 Dec 2009 00:30:34 +0000 (16:30 -0800)]
am
eb34b45e: Revert "fixing build"
Merge commit '
eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd' into eclair-plus-aosp
* commit '
eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd':
Revert "fixing build"
Megha Joshi [Fri, 4 Dec 2009 00:16:52 +0000 (16:16 -0800)]
Revert "fixing build"
This reverts commit
7d1b833e7d1337e9ce85746886bafc98bcab16d8.
Megha Joshi [Thu, 3 Dec 2009 23:23:28 +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:53 +0000 (14:17 -0800)]
am
b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit '
b5ad157bab0298535fa09378f6aca47029f9f475' into eclair-plus-aosp
* 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:15 +0000 (11:50 -0800)]
am
06ddeb0f: Move source prop files for docs/platforms/usb driver back into dev.
Merge commit '
06ddeb0fbd7bd514b17fbb335d5e5e1eeb19397a' into eclair-plus-aosp
* 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:24:24 +0000 (10:24 -0800)]
am
67203cca: add new Bluetooth sample app
Merge commit '
67203cca65901d672803071bfc026c3657b85fdf' into eclair-plus-aosp
* 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:05:17 +0000 (13:05 -0800)]
am
5c52358c: Merge change I8404ae5f into eclair
Merge commit '
5c52358c9b0a95adc0fe8b383289e7e522b2c421' into eclair-plus-aosp
* commit '
5c52358c9b0a95adc0fe8b383289e7e522b2c421':
Move some scripts that were in development/tools/scripts back in this project
Xavier Ducrohet [Wed, 2 Dec 2009 21:05:12 +0000 (13:05 -0800)]
am
86cd8059: Merge change Ia7f1d23e into eclair
Merge commit '
86cd8059dec97e2c1f1797d1e179719561d05162' into eclair-plus-aosp
* 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 04:23:45 +0000 (20:23 -0800)]
am
bc9cac17: Make Gesturebuilder build like a sample.
Merge commit '
bc9cac171505afbf4ecdb5eabb849c98cac1bddc' into eclair-plus-aosp
* commit '
bc9cac171505afbf4ecdb5eabb849c98cac1bddc':
Make Gesturebuilder build like a sample.
Xavier Ducrohet [Wed, 2 Dec 2009 02:31:34 +0000 (18:31 -0800)]
Make Gesturebuilder build like a sample.
Change-Id: I42f097fbb46631de9bb088d7aeade971480c72ae
Xavier Ducrohet [Tue, 1 Dec 2009 21:20:59 +0000 (13:20 -0800)]
Update sdk build to use the new folders in sdk/
Change-Id: Ia7f1d23e452b4b493dc4456f8fedd4dd3d2b006f
Xavier Ducrohet [Tue, 1 Dec 2009 21:03:49 +0000 (13:03 -0800)]
Move some scripts that were in development/tools/scripts back in this project
They were moved into sdk/scripts when sdk was split from development.
Change-Id: I8404ae5fdeb9060adb76357f29b42c4c8e2054ee
Dianne Hackborn [Mon, 30 Nov 2009 19:09:26 +0000 (11:09 -0800)]
am
eb3547b3: Add API demo for services that run in the foreground.
Merge commit '
eb3547b3d0678ad16a602d342cf81dc64e03d9b7' into eclair-plus-aosp
* commit '
eb3547b3d0678ad16a602d342cf81dc64e03d9b7':
Add API demo for services that run in the foreground.
Dianne Hackborn [Thu, 26 Nov 2009 00:40:52 +0000 (16:40 -0800)]
Add API demo for services that run in the foreground.
Change-Id: I7acb0817e5d738294bef02ca2df3c2ab18b45f60
David 'Digit' Turner [Tue, 24 Nov 2009 01:04:35 +0000 (17:04 -0800)]
am
cc09e088: Merge change Icb96cddc into eclair
Merge commit '
cc09e088d869453536a1e9d761bd92df1a19fe62' into eclair-plus-aosp
* commit '
cc09e088d869453536a1e9d761bd92df1a19fe62':
Cleanup installed binaries before the NDK build begins.
Eric Fischer [Tue, 24 Nov 2009 01:04:30 +0000 (17:04 -0800)]
am
0d6684c8: Merge change I44da0c8f into eclair
Merge commit '
0d6684c86f152dabf7476d269fdaa3de1eb8fcac' into eclair-plus-aosp
* commit '
0d6684c86f152dabf7476d269fdaa3de1eb8fcac':
Correct the raw offsets in the time zone index for a few zones.
Android (Google) Code Review [Tue, 24 Nov 2009 00:59:36 +0000 (16:59 -0800)]
Merge change Icb96cddc into eclair
* changes:
Cleanup installed binaries before the NDK build begins.
Android (Google) Code Review [Tue, 24 Nov 2009 00:59:17 +0000 (16:59 -0800)]
Merge change I44da0c8f into eclair
* changes:
Correct the raw offsets in the time zone index for a few zones.
Eric Fischer [Tue, 24 Nov 2009 00:30:34 +0000 (16:30 -0800)]
Correct the raw offsets in the time zone index for a few zones.
ZoneCompactor was using the system time zone database to get the offsets
instead of using the data it was compiling, so for newly added or recently
changed zones the index could be inconsistent with the data.
Affected zones: San_Luis, Casey, Davis, Mawson, Kathmandu, Novokuznetsk
David 'Digit' Turner [Tue, 24 Nov 2009 00:12:12 +0000 (16:12 -0800)]
Cleanup installed binaries before the NDK build begins.
Ensures that no stale/obsolete shared libraries are left in the
application's project path before the build.
Also fix a minor typo that made the ABI selection process not
work properly in certain cases.
Roman Nurik [Mon, 23 Nov 2009 23:38:05 +0000 (15:38 -0800)]
am
0431e70d: Remove placeholder "-" label text, that was breaking the build.
Merge commit '
0431e70ddd0673ed4d9cf69d211592cb2926c076' into eclair-plus-aosp
* commit '
0431e70ddd0673ed4d9cf69d211592cb2926c076':
Remove placeholder "-" label text, that was breaking the build.
Roman Nurik [Mon, 23 Nov 2009 22:54:57 +0000 (17:54 -0500)]
Remove placeholder "-" label text, that was breaking the build.
Roman Nurik [Mon, 23 Nov 2009 22:23:54 +0000 (14:23 -0800)]
am
a7178809: Fresh new change for: Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).
Merge commit '
a7178809f6aecff7c4e3ae3374b7cba5adc692bf' into eclair-plus-aosp
* commit '
a7178809f6aecff7c4e3ae3374b7cba5adc692bf':
Fresh new change for:
Roman Nurik [Mon, 23 Nov 2009 22:11:04 +0000 (17:11 -0500)]
Fresh new change for:
Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).
Previous change 33290 was screwed up.
Xav, please pardon a repo newbie!
Roman Nurik [Mon, 23 Nov 2009 21:50:32 +0000 (13:50 -0800)]
am
f28c33b6: Merge change I4ba0290a into eclair
Merge commit '
f28c33b6ec3401537a386995e2ec13fbc65c1957' into eclair-plus-aosp
* commit '
f28c33b6ec3401537a386995e2ec13fbc65c1957':
Add Multiple Resolutions (MultiRes) sample code.
Android (Google) Code Review [Mon, 23 Nov 2009 21:45:14 +0000 (13:45 -0800)]
Merge change I4ba0290a into eclair
* changes:
Add Multiple Resolutions (MultiRes) sample code.
Scott Main [Mon, 23 Nov 2009 18:13:07 +0000 (10:13 -0800)]
am
e71c2828: am
1558abd6: Merge change I53e268db into eclair-sdk
Merge commit '
e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-plus-aosp
* commit '
e71c282812a870c120ff8bf0989fd78c0191eeb2':
docs: make the apidemos app index page only display the
Scott Main [Mon, 23 Nov 2009 18:07:10 +0000 (10:07 -0800)]
am
1558abd6: Merge change I53e268db into eclair-sdk
Merge commit '
1558abd6d3706380cf4634c151ee7952e0b317fb' into eclair
* commit '
1558abd6d3706380cf4634c151ee7952e0b317fb':
docs: make the apidemos app index page only display the
Android (Google) Code Review [Mon, 23 Nov 2009 17:57:22 +0000 (09:57 -0800)]
Merge change I53e268db into eclair-sdk
* changes:
docs: make the apidemos app index page only display the shortcut links when the docs are online, because these links will not resolve when the docs are offline.
Roman Nurik [Mon, 16 Nov 2009 20:23:42 +0000 (15:23 -0500)]
Add Multiple Resolutions (MultiRes) sample code.
David 'Digit' Turner [Sat, 21 Nov 2009 00:49:43 +0000 (16:49 -0800)]
am
c7f23b57: Merge change Ifb9dee6f into eclair
Merge commit '
c7f23b570c16d99ce30b9819e28caee480795030' into eclair-plus-aosp
* commit '
c7f23b570c16d99ce30b9819e28caee480795030':
Add support for armeabi-v7a to the NDK.
Android (Google) Code Review [Sat, 21 Nov 2009 00:44:45 +0000 (16:44 -0800)]
Merge change Ifb9dee6f into eclair
* changes:
Add support for armeabi-v7a to the NDK.
Eric Fischer [Fri, 20 Nov 2009 23:42:10 +0000 (15:42 -0800)]
am
2ddbd568: Update zoneinfo time zone data to version 2009s
Merge commit '
2ddbd5682b60c8604b0b85ccb280624f8845e22d' into eclair-plus-aosp
* commit '
2ddbd5682b60c8604b0b85ccb280624f8845e22d':
Update zoneinfo time zone data to version 2009s
Scott Main [Fri, 20 Nov 2009 22:38:29 +0000 (14:38 -0800)]
docs: make the apidemos app index page only display the
shortcut links when the docs are online, because these
links will not resolve when the docs are offline.
this is a silly hack, but a temporary one until these
samples are moved.
Change-Id: I53e268db265cec143ca5e561ca2d6b4df3dba3e2
OSDN Git Service
