Commit Graph

3011 Commits

Author SHA1 Message Date
Nicolas Catania
2bfd9db950 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.
2009-12-09 15:47:48 -08:00
Derek Sollenberger
2823d67562 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.
2009-12-09 15:44:43 -08:00
Dianne Hackborn
d564588d7d am 579c7f19: Reorganize Service API demos.
Merge commit '579c7f19ac379294822b976b73fe4037f40eba82' into eclair-mr2-plus-aosp

* commit '579c7f19ac379294822b976b73fe4037f40eba82':
  Reorganize Service API demos.
2009-12-09 15:41:08 -08:00
Andrew Stadler
e85c304f7d resolved conflicts for merge of fa3d6b54 to eclair-mr2-plus-aosp 2009-12-09 12:07:31 -08:00
Android (Google) Code Review
863270d143 Merge change I5ba25302 into eclair-mr2
* changes:
  Added the new phone app unittest to runtest.
2009-12-08 10:49:26 -08:00
Derek Sollenberger
e8454e7969 updating sample plugin to use new full screen interfaces. 2009-12-08 08:11:33 -05:00
Nicolas Catania
6f0366f773 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'.
2009-12-07 21:13:22 -08:00
Dianne Hackborn
579c7f19ac Reorganize Service API demos.
This collapses multiple related files in one, to make it easier to deal
with in documentation and elsewhere.
2009-12-07 18:05:40 -08:00
Megha Joshi
0a510b1f70 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
2009-12-07 17:03:40 -08:00
Android (Google) Code Review
fa3d6b5411 Merge change Ifc1b1ccb into eclair-mr2
* changes:
  Fix eclipse build
2009-12-07 16:59:07 -08:00
Megha Joshi
0cf6092e74 am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34' into eclair-mr2

* commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34':
  Add QuickContactsBadge widget sample to ApiDemos
2009-12-07 16:59:00 -08:00
Megha Joshi
11d89599ef Add QuickContactsBadge widget sample to ApiDemos 2009-12-07 16:53:24 -08:00
Marco Nelissen
92f95ee3fb 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.
2009-12-07 16:02:40 -08:00
Marco Nelissen
bd642f3e94 Make the simulator use alsa instead of esound. 2009-12-07 12:31:36 -08:00
Andrew Stadler
fc1b1ccbcf Fix eclipse build
* Bring in auto-generated EventLogTags
2009-12-07 10:55:39 -08:00
Owen Lin
0a91a547ee am 0ee41ccc: Merge change I1558a070 into eclair-mr2
Merge commit '0ee41ccc1429b83c6ab62cb99e081826a94741e8' into eclair-mr2-plus-aosp

* commit '0ee41ccc1429b83c6ab62cb99e081826a94741e8':
  Fix the camera preview demo.
2009-12-07 00:04:49 -08:00
Android (Google) Code Review
0ee41ccc14 Merge change I1558a070 into eclair-mr2
* changes:
  Fix the camera preview demo.
2009-12-07 00:00:07 -08:00
David 'Digit' Turner
cc3d391351 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.
2009-12-04 18:31:25 -08:00
David 'Digit' Turner
85f5c42069 am e8d64956: Merge change I6b913ab8 into eclair
Merge commit 'e8d649561a6dbc6e0260d4b24049c00d23e7285b' into eclair-mr2

* commit 'e8d649561a6dbc6e0260d4b24049c00d23e7285b':
  Fix toolchain scripts for Darwin and Cygwin.
2009-12-04 18:27:05 -08:00
Android (Google) Code Review
e8d649561a Merge change I6b913ab8 into eclair
* changes:
  Fix toolchain scripts for Darwin and Cygwin.
2009-12-04 18:22:21 -08:00
David 'Digit' Turner
6b913ab885 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.
2009-12-04 17:57:36 -08:00
Megha Joshi
f10748929f am 2321ba48: am b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit '2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83' into eclair-mr2-plus-aosp

* commit '2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83':
  Adding wallpaper sample in ApiDemos.
2009-12-04 17:10:40 -08:00
Megha Joshi
2321ba48ba am b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit 'b49dd8359d1b23eb527139499c0db58cb01466c6' into eclair-mr2

* commit 'b49dd8359d1b23eb527139499c0db58cb01466c6':
  Adding wallpaper sample in ApiDemos.
2009-12-04 17:06:39 -08:00
Megha Joshi
b49dd8359d Adding wallpaper sample in ApiDemos. 2009-12-04 17:00:21 -08:00
Marco Nelissen
1009e293d0 am ac2a5cf7: Fix fake timing.
Merge commit 'ac2a5cf7e45a2fa7936119517e4f52517b9d5747' into eclair-mr2-plus-aosp

* commit 'ac2a5cf7e45a2fa7936119517e4f52517b9d5747':
  Fix fake timing.
2009-12-04 14:48:27 -08:00
Marco Nelissen
ac2a5cf7e4 Fix fake timing. 2009-12-04 14:44:43 -08:00
Scott Main
768421daf5 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
2009-12-03 18:24:44 -08:00
Scott Main
2eaa8880f0 am c5a640ee: Merge change Icce4f510 into eclair
Merge commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72' into eclair-mr2

* commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72':
  change BT sample minsdkversion to 6 because it
2009-12-03 18:14:59 -08:00
Android (Google) Code Review
c5a640ee3a Merge change Icce4f510 into eclair
* changes:
  change BT sample minsdkversion to 6 because it uses the revised result codes when enabling BT
2009-12-03 18:07:52 -08:00
Scott Main
cce4f51025 change BT sample minsdkversion to 6 because it
uses the revised result codes when enabling BT
2009-12-03 17:59:47 -08:00
Andrew Stadler
f9c2e07d2c am 21b8dbe5: Merge change Ia8c35b58 into eclair-mr2
Merge commit '21b8dbe5c4f657f673bae2b1ad298f91465616d2' into eclair-mr2-plus-aosp

* commit '21b8dbe5c4f657f673bae2b1ad298f91465616d2':
  Track library changes
2009-12-03 17:05:38 -08:00
Android (Google) Code Review
21b8dbe5c4 Merge change Ia8c35b58 into eclair-mr2
* changes:
  Track library changes
2009-12-03 17:00:05 -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
Andrew Stadler
a8c35b58ab Track library changes
Fixes build errors in eclipse around CalendarProvider
2009-12-03 15:35:07 -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