Commit Graph

3384 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
c856cff82f am 394ef56d: am aecf2c65: am 76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '394ef56df8af1e569458f6159ce79b055bb846ef'

* commit '394ef56df8af1e569458f6159ce79b055bb846ef':
  Revert "adding set wallpaper sample code in ApiDemos."
2009-12-04 04:29:50 -08:00
Megha Joshi
8002f5d63b am 61f3e6cd: am f6d9c9d4: am eb34b45e: Revert "fixing build"
Merge commit '61f3e6cdaa4d420cde85392a76feebc7769e48fa'

* commit '61f3e6cdaa4d420cde85392a76feebc7769e48fa':
  Revert "fixing build"
2009-12-04 04:29:45 -08:00
Megha Joshi
0ab8f1045d am e4ddc394: am 59b2923c: am 7d1b833e: fixing build
Merge commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf'

* commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf':
  fixing build
2009-12-04 04:22:09 -08:00
Megha Joshi
a827f32ed3 am 39248181: am b4fe143c: am b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit '392481816eec1869345031d1600251dea8fba275'

* commit '392481816eec1869345031d1600251dea8fba275':
  adding set wallpaper sample code in ApiDemos.
2009-12-04 04:22:02 -08:00
Xavier Ducrohet
8332978ba1 am 93a523b5: am 92fd5c63: am 06ddeb0f: Move source prop files for docs/platforms/usb driver back into dev.
Merge commit '93a523b54fc45918c43e622c7c8bf06da26f7e73'

* commit '93a523b54fc45918c43e622c7c8bf06da26f7e73':
  Move source prop files for docs/platforms/usb driver back into dev.
2009-12-04 04:21:56 -08:00
Scott Main
6d416ccb28 am bc40fb93: am 43bba677: am 67203cca: add new Bluetooth sample app
Merge commit 'bc40fb9388c0f142831b4a2ac4a2526206fc7e15'

* commit 'bc40fb9388c0f142831b4a2ac4a2526206fc7e15':
  add new Bluetooth sample app
2009-12-04 04:21:49 -08:00
Jean-Baptiste Queru
394ef56df8 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."
2009-12-03 16:57:41 -08:00
Megha Joshi
61f3e6cdaa am f6d9c9d4: am eb34b45e: Revert "fixing build"
Merge commit 'f6d9c9d427c70017757dcddf5b396de2d5f2f33d' into eclair-mr2-plus-aosp

* commit 'f6d9c9d427c70017757dcddf5b396de2d5f2f33d':
  Revert "fixing build"
2009-12-03 16:53:33 -08:00
Jean-Baptiste Queru
aecf2c6581 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."
2009-12-03 16:43:32 -08:00
Megha Joshi
e4ddc394fa am 59b2923c: am 7d1b833e: fixing build
Merge commit '59b2923c6025812154baf329d636291f55430e0e' into eclair-mr2-plus-aosp

* commit '59b2923c6025812154baf329d636291f55430e0e':
  fixing build
2009-12-03 16:42:00 -08:00
Megha Joshi
392481816e 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.
2009-12-03 16:41:05 -08:00
Jean-Baptiste Queru
76c9d31ce3 Revert "adding set wallpaper sample code in ApiDemos."
This reverts commit b5ad157bab.
2009-12-03 16:35:23 -08:00
Xavier Ducrohet
93a523b54f 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.
2009-12-03 16:34:13 -08:00
Megha Joshi
f6d9c9d427 am eb34b45e: Revert "fixing build"
Merge commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd' into eclair-mr2

* commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd':
  Revert "fixing build"
2009-12-03 16:29:58 -08:00
Scott Main
bc40fb9388 am 43bba677: am 67203cca: add new Bluetooth sample app
Merge commit '43bba677c9f8de4ad01c17387c56e9a1e91fa175' into eclair-mr2-plus-aosp

* commit '43bba677c9f8de4ad01c17387c56e9a1e91fa175':
  add new Bluetooth sample app
2009-12-03 16:28:34 -08:00
Megha Joshi
eb34b45ef1 Revert "fixing build"
This reverts commit 7d1b833e7d.
2009-12-03 16:16:52 -08:00
Megha Joshi
59b2923c60 am 7d1b833e: fixing build
Merge commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8' into eclair-mr2

* commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8':
  fixing build
2009-12-03 15:23:37 -08:00
Megha Joshi
7d1b833e7d fixing build 2009-12-03 15:13:10 -08:00
Megha Joshi
b4fe143cfe am b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit 'b5ad157bab0298535fa09378f6aca47029f9f475' into eclair-mr2

* commit 'b5ad157bab0298535fa09378f6aca47029f9f475':
  adding set wallpaper sample code in ApiDemos.
2009-12-03 14:17:55 -08:00
Megha Joshi
b5ad157bab adding set wallpaper sample code in ApiDemos. 2009-12-03 13:56:37 -08:00
Xavier Ducrohet
92fd5c6357 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.
2009-12-03 11:50:21 -08:00
Xavier Ducrohet
06ddeb0fbd Move source prop files for docs/platforms/usb driver back into dev.
Change-Id: I4632dc69432b720d586c84834f89c843a2eaf5cd
2009-12-03 11:34:13 -08:00
Scott Main
43bba677c9 am 67203cca: add new Bluetooth sample app
Merge commit '67203cca65901d672803071bfc026c3657b85fdf' into eclair-mr2

* commit '67203cca65901d672803071bfc026c3657b85fdf':
  add new Bluetooth sample app
2009-12-03 10:23:30 -08:00
Xavier Ducrohet
a48caf202c am 97d2521e: am b06a8a0c: am 5c52358c: Merge change I8404ae5f into eclair
Merge commit '97d2521e67df9ce745fa39a88ca3ec5bfe580d33'

* commit '97d2521e67df9ce745fa39a88ca3ec5bfe580d33':
  Move some scripts that were in development/tools/scripts back in this project
2009-12-02 20:37:50 -08:00
Xavier Ducrohet
f55508c67f am ac986b0d: am 6be8bb5f: am 86cd8059: Merge change Ia7f1d23e into eclair
Merge commit 'ac986b0d117a72482b8490a9c84b56d2c239da49'

* commit 'ac986b0d117a72482b8490a9c84b56d2c239da49':
  Update sdk build to use the new folders in sdk/
2009-12-02 20:37:46 -08:00
Xavier Ducrohet
72da14f2e0 am 1d46eb30: am 7271d158: am bc9cac17: Make Gesturebuilder build like a sample.
Merge commit '1d46eb3093723d509e45d33f65676dc3fd8f0360'

* commit '1d46eb3093723d509e45d33f65676dc3fd8f0360':
  Make Gesturebuilder build like a sample.
2009-12-02 20:30:05 -08:00
Scott Main
67203cca65 add new Bluetooth sample app 2009-12-02 16:27:00 -08:00
Xavier Ducrohet
97d2521e67 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
2009-12-02 13:13:05 -08:00
Xavier Ducrohet
ac986b0d11 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/
2009-12-02 13:13:01 -08:00
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