OSDN Git Service
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.
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.
Xavier Ducrohet [Wed, 2 Dec 2009 02:31:34 +0000 (18:31 -0800)]
Make Gesturebuilder build like a sample.
Change-Id: I42f097fbb46631de9bb088d7aeade971480c72ae
Dianne Hackborn [Wed, 2 Dec 2009 01:24:06 +0000 (17:24 -0800)]
am
c46a762e: am
eb3547b3: Add API demo for services that run in the foreground.
Merge commit '
c46a762ee35b8630ed9f824e0627566fe7cfe605' into eclair-mr2-plus-aosp
* commit '
c46a762ee35b8630ed9f824e0627566fe7cfe605':
Add API demo for services that run in the foreground.
Doug Zongker [Wed, 2 Dec 2009 01:24:00 +0000 (17:24 -0800)]
am
4c959175: add one script to make release keys
Merge commit '
4c95917590d1a992b7fe8f6e703353fdf5a0bf3c' into eclair-mr2-plus-aosp
* commit '
4c95917590d1a992b7fe8f6e703353fdf5a0bf3c':
add one script to make release keys
Dianne Hackborn [Wed, 2 Dec 2009 01:05:18 +0000 (17:05 -0800)]
am
eb3547b3: Add API demo for services that run in the foreground.
Merge commit '
eb3547b3d0678ad16a602d342cf81dc64e03d9b7' into eclair-mr2
* commit '
eb3547b3d0678ad16a602d342cf81dc64e03d9b7':
Add API demo for services that run in the foreground.
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
Doug Zongker [Tue, 1 Dec 2009 20:26:51 +0000 (12:26 -0800)]
add one script to make release keys
This script can replace the copies of mkkey.sh sprinkled all over the
tree. It prompts nicely for passwords, avoids writing the raw private
key to disk, and always generates certs that use sha1WithRSAEncryption.
Derek Sollenberger [Tue, 1 Dec 2009 14:13:40 +0000 (06:13 -0800)]
am
51cce58c: Ensure the plugin\'s native code is never called with an invalid NPP pointer.
Merge commit '
51cce58c45591fdf3d0cd59a92aeb18182eaeded' into eclair-mr2-plus-aosp
* commit '
51cce58c45591fdf3d0cd59a92aeb18182eaeded':
Ensure the plugin's native code is never called with an invalid NPP pointer.
Derek Sollenberger [Tue, 1 Dec 2009 13:26:20 +0000 (08:26 -0500)]
Ensure the plugin's native code is never called with an invalid NPP pointer.
Derek Sollenberger [Tue, 1 Dec 2009 13:22:25 +0000 (05:22 -0800)]
am
e62ce17a: Refactoring the logging interface to remove dependence on NPP.
Merge commit '
e62ce17ac9726d6c169d5378db6027b2d8a16fcc' into eclair-mr2-plus-aosp
* commit '
e62ce17ac9726d6c169d5378db6027b2d8a16fcc':
Refactoring the logging interface to remove dependence on NPP.
Derek Sollenberger [Mon, 30 Nov 2009 16:52:06 +0000 (11:52 -0500)]
Refactoring the logging interface to remove dependence on NPP.
Derek Sollenberger [Mon, 30 Nov 2009 15:55:30 +0000 (07:55 -0800)]
am
04b3e9a6: Refactoring sample plugin to use updated java interfaces.
Merge commit '
04b3e9a6c6cf43887e9551ea1da7681f071b8696' into eclair-mr2-plus-aosp
* commit '
04b3e9a6c6cf43887e9551ea1da7681f071b8696':
Refactoring sample plugin to use updated java interfaces.
Derek Sollenberger [Tue, 24 Nov 2009 19:50:55 +0000 (14:50 -0500)]
Refactoring sample plugin to use updated java interfaces.
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
Andrew Stadler [Wed, 25 Nov 2009 00:13:55 +0000 (16:13 -0800)]
am
2171d57c: Merge change I6f2fcdd7 into eclair-mr2
Merge commit '
2171d57cfcc25e7db63b4ae0a852504bdd3c507e' into eclair-mr2-plus-aosp
* commit '
2171d57cfcc25e7db63b4ae0a852504bdd3c507e':
Fix eclipse default .classpath
Android (Google) Code Review [Wed, 25 Nov 2009 00:08:54 +0000 (16:08 -0800)]
Merge change I6f2fcdd7 into eclair-mr2
* changes:
Fix eclipse default .classpath
Andrew Stadler [Tue, 24 Nov 2009 21:50:26 +0000 (13:50 -0800)]
Fix eclipse default .classpath
* Add frameworks/base/common/java
* Remove external/googleclient/googleclient-lib.jar
David 'Digit' Turner [Tue, 24 Nov 2009 01:08:16 +0000 (17:08 -0800)]
am
4b4129d3: am
cc09e088: Merge change Icb96cddc into eclair
Merge commit '
4b4129d30c75ab58f2ff9cb0696e894fde2b144b' into eclair-mr2-plus-aosp
* commit '
4b4129d30c75ab58f2ff9cb0696e894fde2b144b':
Cleanup installed binaries before the NDK build begins.
Eric Fischer [Tue, 24 Nov 2009 01:08:12 +0000 (17:08 -0800)]
am
78cab803: am
0d6684c8: Merge change I44da0c8f into eclair
Merge commit '
78cab8038a79f1e42e42b17b0ff180e676653e31' into eclair-mr2-plus-aosp
* commit '
78cab8038a79f1e42e42b17b0ff180e676653e31':
Correct the raw offsets in the time zone index for a few zones.
David 'Digit' Turner [Tue, 24 Nov 2009 01:04:14 +0000 (17:04 -0800)]
am
cc09e088: Merge change Icb96cddc into eclair
Merge commit '
cc09e088d869453536a1e9d761bd92df1a19fe62' into eclair-mr2
* commit '
cc09e088d869453536a1e9d761bd92df1a19fe62':
Cleanup installed binaries before the NDK build begins.
Eric Fischer [Tue, 24 Nov 2009 01:04:10 +0000 (17:04 -0800)]
am
0d6684c8: Merge change I44da0c8f into eclair
Merge commit '
0d6684c86f152dabf7476d269fdaa3de1eb8fcac' into eclair-mr2
* 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:43:25 +0000 (15:43 -0800)]
am
14f81209: am
0431e70d: Remove placeholder "-" label text, that was breaking the build.
Merge commit '
14f81209b79faf87bf4ffed6fbaaa9da6a75d770' into eclair-mr2-plus-aosp
* commit '
14f81209b79faf87bf4ffed6fbaaa9da6a75d770':
Remove placeholder "-" label text, that was breaking the build.
Roman Nurik [Mon, 23 Nov 2009 23:37:35 +0000 (15:37 -0800)]
am
0431e70d: Remove placeholder "-" label text, that was breaking the build.
Merge commit '
0431e70ddd0673ed4d9cf69d211592cb2926c076' into eclair-mr2
* 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:28:32 +0000 (14:28 -0800)]
am
536fc99b: 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 '
536fc99b535f6848752615a1b2bf0cddf8f23491' into eclair-mr2-plus-aosp
* commit '
536fc99b535f6848752615a1b2bf0cddf8f23491':
Fresh new change for:
Roman Nurik [Mon, 23 Nov 2009 22:24:37 +0000 (14:24 -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-mr2
* 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:53:42 +0000 (13:53 -0800)]
am
ea6616ac: am
f28c33b6: Merge change I4ba0290a into eclair
Merge commit '
ea6616ac3d733b1627d5addc9c62412d53dd1c26' into eclair-mr2-plus-aosp
* commit '
ea6616ac3d733b1627d5addc9c62412d53dd1c26':
Add Multiple Resolutions (MultiRes) sample code.
Roman Nurik [Mon, 23 Nov 2009 21:51:01 +0000 (13:51 -0800)]
am
f28c33b6: Merge change I4ba0290a into eclair
Merge commit '
f28c33b6ec3401537a386995e2ec13fbc65c1957' into eclair-mr2
* 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:18:24 +0000 (10:18 -0800)]
am
21acc900: am
e71c2828: am
1558abd6: Merge change I53e268db into eclair-sdk
Merge commit '
21acc90055935d052e350fe441091091c2421010' into eclair-mr2-plus-aosp
* commit '
21acc90055935d052e350fe441091091c2421010':
docs: make the apidemos app index page only display the
Scott Main [Mon, 23 Nov 2009 18:13:44 +0000 (10:13 -0800)]
am
e71c2828: am
1558abd6: Merge change I53e268db into eclair-sdk
Merge commit '
e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2
* 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:53:51 +0000 (16:53 -0800)]
am
2e00a813: am
c7f23b57: Merge change Ifb9dee6f into eclair
Merge commit '
2e00a8137d02b7478687f08431cd1f62abf17344' into eclair-mr2-plus-aosp
* commit '
2e00a8137d02b7478687f08431cd1f62abf17344':
Add support for armeabi-v7a to the NDK.
David 'Digit' Turner [Sat, 21 Nov 2009 00:48:53 +0000 (16:48 -0800)]
am
c7f23b57: Merge change Ifb9dee6f into eclair
Merge commit '
c7f23b570c16d99ce30b9819e28caee480795030' into eclair-mr2
* 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:47:08 +0000 (15:47 -0800)]
am
7c91ccfe: am
2ddbd568: Update zoneinfo time zone data to version 2009s
Merge commit '
7c91ccfe1407cc192fb57c964c6419630cf651c0' into eclair-mr2-plus-aosp
* commit '
7c91ccfe1407cc192fb57c964c6419630cf651c0':
Update zoneinfo time zone data to version 2009s
Eric Fischer [Fri, 20 Nov 2009 23:42:04 +0000 (15:42 -0800)]
am
2ddbd568: Update zoneinfo time zone data to version 2009s
Merge commit '
2ddbd5682b60c8604b0b85ccb280624f8845e22d' into eclair-mr2
* 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
Eric Fischer [Fri, 20 Nov 2009 22:37:35 +0000 (14:37 -0800)]
Update zoneinfo time zone data to version 2009s
http://b/issue?id=
2272477
David 'Digit' Turner [Thu, 19 Nov 2009 02:05:55 +0000 (18:05 -0800)]
Add support for armeabi-v7a to the NDK.
This patch modifies the NDK build scripts to support the 'armeabi-v7a' ABI.
(For the record, it corresponds to Thumb-2 + FPU support, to speed up native
code on certain devices like the Droid).
To build for this ABI, the Application.mk file should use a line like:
APP_ABI := armeabi-v7a
It is also possible to build for both 'armeabi' and 'armeabi-v7a' by using:
APP_ABI := armeabi armeabi-v7a
This will result in the generation of two distinct shared libraries that both
will be copied to the final application package.
This is dependent on having GCC 4.4.0 prebuilt binaries under
build/prebuilt/<host>/arm-eabi-4.4.0, since gcc 4.2.1 does not support
this new ABI.
Note that this also changes the NDK to use gcc 4.4.0 by default, unless
the user defines NDK_TOOLCHAIN to 'arm-eabi-4.2.1' in its environment to
switch back to the previous one.
David 'Digit' Turner [Thu, 19 Nov 2009 21:54:39 +0000 (13:54 -0800)]
am
1f22df41: am
b4e31b93: Merge change I3f0d5eb5 into eclair
Merge commit '
1f22df41d80b06331056fe3915a3d7c394b1485f' into eclair-mr2-plus-aosp
* commit '
1f22df41d80b06331056fe3915a3d7c394b1485f':
Update the build-toolchain.sh script.
David 'Digit' Turner [Thu, 19 Nov 2009 21:49:22 +0000 (13:49 -0800)]
am
b4e31b93: Merge change I3f0d5eb5 into eclair
Merge commit '
b4e31b931d08e6269a194a1c24e23281410dff64' into eclair-mr2
* commit '
b4e31b931d08e6269a194a1c24e23281410dff64':
Update the build-toolchain.sh script.
Android (Google) Code Review [Thu, 19 Nov 2009 21:45:53 +0000 (13:45 -0800)]
Merge change I3f0d5eb5 into eclair
* changes:
Update the build-toolchain.sh script.
David 'Digit' Turner [Thu, 19 Nov 2009 01:03:52 +0000 (17:03 -0800)]
Update the build-toolchain.sh script.
This patch modifies the script to be able to build all prebuilt toolchain
binaries in a single call. I.e. if passed a recent toolchain source package
generated with download-toolchain-sources.sh, then it will build both
GCC 4.2.1 and GCC 4.4.0 and place them in the final prebuilt tarball.
We need this because, while we're going to switch to gcc 4.4.0 by default
in a new version of the NDK, the 4.4.0 C++ compiler is more strict about
various constructs and might refuse to build certain sources. An option
will be given to application developers to use 4.2.1 instead, to keep their
sources building.
Other changes include:
Move all builds into a random temporary directory under /tmp by default,
unless you use --build-out=<path>.
Cleanup the build out directory on succesful build
The generated tarball is now named android-ndk-prebuilt-<date>-<host>.tar.bz2
by default, unless you use the new --release=<name> option which will replace
<date> with <name> instead.
Removal of un-needed files (e.g. info or man pages, libiberty static library,
etc..) to reduce the size of the final tarball.
Jeff Hamilton [Thu, 19 Nov 2009 19:04:42 +0000 (11:04 -0800)]
am
4865c539: Add a runtest entry for the database tests.
Merge commit '
4865c5393faedabcb6884e745cb4b2393674c8fd' into eclair-mr2-plus-aosp
* commit '
4865c5393faedabcb6884e745cb4b2393674c8fd':
Add a runtest entry for the database tests.
Jeff Hamilton [Thu, 19 Nov 2009 18:15:23 +0000 (10:15 -0800)]
Add a runtest entry for the database tests.
Xavier Ducrohet [Thu, 19 Nov 2009 01:52:10 +0000 (17:52 -0800)]
resolved conflicts for merge of
8915fd90 to eclair-mr2-plus-aosp