Commit Graph

3405 Commits

Author SHA1 Message Date
Xavier Ducrohet
b06a8a0ca0 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
2009-12-02 13:05:27 -08:00
Xavier Ducrohet
6be8bb5f2a 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/
2009-12-02 13:05:21 -08:00
Android (Google) Code Review
5c52358c9b Merge change I8404ae5f into eclair
* changes:
  Move some scripts that were in development/tools/scripts back in this project
2009-12-02 13:00:08 -08:00
Android (Google) Code Review
86cd8059de Merge change Ia7f1d23e into eclair
* changes:
  Update sdk build to use the new folders in sdk/
2009-12-02 12:59:48 -08:00
Xavier Ducrohet
1d46eb3093 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.
2009-12-02 10:01:09 -08:00
Xavier Ducrohet
7271d15820 am bc9cac17: Make Gesturebuilder build like a sample.
Merge commit 'bc9cac171505afbf4ecdb5eabb849c98cac1bddc' into eclair-mr2

* commit 'bc9cac171505afbf4ecdb5eabb849c98cac1bddc':
  Make Gesturebuilder build like a sample.
2009-12-02 09:48:15 -08:00
Xavier Ducrohet
bc9cac1715 Make Gesturebuilder build like a sample.
Change-Id: I42f097fbb46631de9bb088d7aeade971480c72ae
2009-12-01 18:31:34 -08:00
Dianne Hackborn
0c136d6cb9 am 7bd36462: am c46a762e: am eb3547b3: Add API demo for services that run in the foreground.
Merge commit '7bd364622b5204f46c9a7e4e9bc3692c755b7de4'

* commit '7bd364622b5204f46c9a7e4e9bc3692c755b7de4':
  Add API demo for services that run in the foreground.
2009-12-01 17:34:28 -08:00
Doug Zongker
b9bb57b384 am c20e78e0: am 4c959175: add one script to make release keys
Merge commit 'c20e78e01526f550b3617aebef925b2eadfe1951'

* commit 'c20e78e01526f550b3617aebef925b2eadfe1951':
  add one script to make release keys
2009-12-01 17:34:22 -08:00
Dianne Hackborn
7bd364622b 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.
2009-12-01 17:24:06 -08:00
Doug Zongker
c20e78e015 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
2009-12-01 17:24:00 -08:00
Dianne Hackborn
c46a762ee3 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.
2009-12-01 17:05:18 -08:00
Xavier Ducrohet
1ed7cb992a Update sdk build to use the new folders in sdk/
Change-Id: Ia7f1d23e452b4b493dc4456f8fedd4dd3d2b006f
2009-12-01 13:20:59 -08:00
Xavier Ducrohet
b958224f51 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
2009-12-01 13:03:49 -08:00
Doug Zongker
4c95917590 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.
2009-12-01 12:32:00 -08:00
Derek Sollenberger
423b0ad7cf am bd2ced11: am 51cce58c: Ensure the plugin\'s native code is never called with an invalid NPP pointer.
Merge commit 'bd2ced1184a498fe5e6d93e780707e99971a0216'

* commit 'bd2ced1184a498fe5e6d93e780707e99971a0216':
  Ensure the plugin's native code is never called with an invalid NPP pointer.
2009-12-01 09:14:50 -08:00
Derek Sollenberger
f80b552e6f am 621b6bfa: am e62ce17a: Refactoring the logging interface to remove dependence on NPP.
Merge commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916'

* commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916':
  Refactoring the logging interface to remove dependence on NPP.
2009-12-01 09:14:07 -08:00
Derek Sollenberger
bd2ced1184 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.
2009-12-01 06:13:40 -08:00
Derek Sollenberger
51cce58c45 Ensure the plugin's native code is never called with an invalid NPP pointer. 2009-12-01 08:26:20 -05:00
Derek Sollenberger
621b6bfad1 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.
2009-12-01 05:22:25 -08:00
Android (Google) Code Review
bef4c4f818 Merge change Ifbc44116
* changes:
  Add OpenGL ES 2.0 sample.
2009-11-30 16:07:10 -08:00
Derek Sollenberger
e62ce17ac9 Refactoring the logging interface to remove dependence on NPP. 2009-11-30 11:52:06 -05:00
Derek Sollenberger
cf4ade259f am b6fd8a3f: am 04b3e9a6: Refactoring sample plugin to use updated java interfaces.
Merge commit 'b6fd8a3fe7306b4d94ef7a11acb1d068e6e25d0e'

* commit 'b6fd8a3fe7306b4d94ef7a11acb1d068e6e25d0e':
  Refactoring sample plugin to use updated java interfaces.
2009-11-30 07:59:58 -08:00
Derek Sollenberger
b6fd8a3fe7 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.
2009-11-30 07:55:30 -08:00
Derek Sollenberger
04b3e9a6c6 Refactoring sample plugin to use updated java interfaces. 2009-11-30 08:41:08 -05:00
Jack Palevich
fbc44116df 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.
2009-11-27 19:54:46 +08:00
Dianne Hackborn
eb3547b3d0 Add API demo for services that run in the foreground.
Change-Id: I7acb0817e5d738294bef02ca2df3c2ab18b45f60
2009-11-25 17:06:53 -08:00
Andrew Stadler
47f5ff803b am 140e10cf: am 2171d57c: Merge change I6f2fcdd7 into eclair-mr2
Merge commit '140e10cfae201688bc10f67ad12c989b67f60b3c'

* commit '140e10cfae201688bc10f67ad12c989b67f60b3c':
  Fix eclipse default .classpath
2009-11-24 16:17:22 -08:00
Andrew Stadler
140e10cfae am 2171d57c: Merge change I6f2fcdd7 into eclair-mr2
Merge commit '2171d57cfcc25e7db63b4ae0a852504bdd3c507e' into eclair-mr2-plus-aosp

* commit '2171d57cfcc25e7db63b4ae0a852504bdd3c507e':
  Fix eclipse default .classpath
2009-11-24 16:13:55 -08:00
Android (Google) Code Review
2171d57cfc Merge change I6f2fcdd7 into eclair-mr2
* changes:
  Fix eclipse default .classpath
2009-11-24 16:08:54 -08:00
Andrew Stadler
6f2fcdd7d4 Fix eclipse default .classpath
* Add frameworks/base/common/java
* Remove external/googleclient/googleclient-lib.jar
2009-11-24 13:50:26 -08:00
David 'Digit' Turner
e728c1660b am 014d368c: am 4b4129d3: am cc09e088: Merge change Icb96cddc into eclair
Merge commit '014d368c389cfeb29aeb59448696cf08a6d8c47a'

* commit '014d368c389cfeb29aeb59448696cf08a6d8c47a':
  Cleanup installed binaries before the NDK build begins.
2009-11-23 17:12:25 -08:00
Eric Fischer
f7246208e9 am f7c5f462: am 78cab803: am 0d6684c8: Merge change I44da0c8f into eclair
Merge commit 'f7c5f462dd904a00d7d0bfb7e4cb300798592cdf'

* commit 'f7c5f462dd904a00d7d0bfb7e4cb300798592cdf':
  Correct the raw offsets in the time zone index for a few zones.
2009-11-23 17:12:21 -08:00
David 'Digit' Turner
014d368c38 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.
2009-11-23 17:08:16 -08:00
Eric Fischer
f7c5f462dd 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.
2009-11-23 17:08:12 -08:00
David 'Digit' Turner
4b4129d30c am cc09e088: Merge change Icb96cddc into eclair
Merge commit 'cc09e088d869453536a1e9d761bd92df1a19fe62' into eclair-mr2

* commit 'cc09e088d869453536a1e9d761bd92df1a19fe62':
  Cleanup installed binaries before the NDK build begins.
2009-11-23 17:04:14 -08:00
Eric Fischer
78cab8038a 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.
2009-11-23 17:04:10 -08:00
Android (Google) Code Review
cc09e088d8 Merge change Icb96cddc into eclair
* changes:
  Cleanup installed binaries before the NDK build begins.
2009-11-23 16:59:36 -08:00
Android (Google) Code Review
0d6684c86f Merge change I44da0c8f into eclair
* changes:
  Correct the raw offsets in the time zone index for a few zones.
2009-11-23 16:59:17 -08:00
Eric Fischer
1f9f586c83 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
2009-11-23 16:45:09 -08:00
David 'Digit' Turner
cb96cddc77 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.
2009-11-23 16:12:12 -08:00
Roman Nurik
23d4440563 am ef50eddd: am 14f81209: am 0431e70d: Remove placeholder "-" label text, that was breaking the build.
Merge commit 'ef50edddcc8224460aeac2b3ce41b8e332925c65'

* commit 'ef50edddcc8224460aeac2b3ce41b8e332925c65':
  Remove placeholder "-" label text, that was breaking the build.
2009-11-23 16:07:31 -08:00
Roman Nurik
b50cd5b656 am 5797aa8a: 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 '5797aa8abe19a99019623105f6229b63fb8b4cc6'

* commit '5797aa8abe19a99019623105f6229b63fb8b4cc6':
  Fresh new change for:
2009-11-23 16:04:54 -08:00
Roman Nurik
4b8db8ce70 am 2c522fa3: am ea6616ac: am f28c33b6: Merge change I4ba0290a into eclair
Merge commit '2c522fa3b79ce117769a06d9fd0a9b0a9e810be1'

* commit '2c522fa3b79ce117769a06d9fd0a9b0a9e810be1':
  Add Multiple Resolutions (MultiRes) sample code.
2009-11-23 16:04:28 -08:00
Roman Nurik
ef50edddcc 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.
2009-11-23 15:43:25 -08:00
Roman Nurik
14f81209b7 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.
2009-11-23 15:37:35 -08:00
Roman Nurik
0431e70ddd Remove placeholder "-" label text, that was breaking the build. 2009-11-23 17:54:57 -05:00
Roman Nurik
5797aa8abe 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:
2009-11-23 14:28:32 -08:00
Roman Nurik
536fc99b53 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:
2009-11-23 14:24:37 -08:00
Roman Nurik
a7178809f6 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!
2009-11-23 17:12:19 -05:00