Megha Joshi
c38796e255
am 0a510b1f: am 0cf6092e: am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
...
Merge commit '0a510b1f704ac940cf3d166a4f139c1910db1677'
* commit '0a510b1f704ac940cf3d166a4f139c1910db1677':
Add QuickContactsBadge widget sample to ApiDemos
2009-12-08 14:52:03 -08:00
Derek Sollenberger
e8454e7969
updating sample plugin to use new full screen interfaces.
2009-12-08 08:11:33 -05:00
James Yum
d2962a3321
TextToSpeech API demo.
2009-12-07 18:35:56 -08:00
Owen Lin
b05eba3155
am 0a91a547: am 0ee41ccc: Merge change I1558a070 into eclair-mr2
...
Merge commit '0a91a547ee32d559b7b737f69430d4d0732dfca9'
* commit '0a91a547ee32d559b7b737f69430d4d0732dfca9':
Fix the camera preview demo.
2009-12-07 18:30:14 -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
Megha Joshi
b3ed38b90e
am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
...
Merge commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34' into eclair-plus-aosp
* commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34':
Add QuickContactsBadge widget sample to ApiDemos
2009-12-07 16:59:39 -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
Megha Joshi
2d5ebf1e18
am f1074892: am 2321ba48: am b49dd835: Adding wallpaper sample in ApiDemos.
...
Merge commit 'f10748929f7edcf142357d03bed5464964284fdb'
* commit 'f10748929f7edcf142357d03bed5464964284fdb':
Adding wallpaper sample in ApiDemos.
2009-12-07 14:56:59 -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
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
5bd13f2f4e
am b49dd835: Adding wallpaper sample in ApiDemos.
...
Merge commit 'b49dd8359d1b23eb527139499c0db58cb01466c6' into eclair-plus-aosp
* commit 'b49dd8359d1b23eb527139499c0db58cb01466c6':
Adding wallpaper sample in ApiDemos.
2009-12-04 17:06:09 -08:00
Megha Joshi
b49dd8359d
Adding wallpaper sample in ApiDemos.
2009-12-04 17:00:21 -08:00
Scott Main
d6d4b71608
am 768421da: am 2eaa8880: am c5a640ee: Merge change Icce4f510 into eclair
...
Merge commit '768421daf5745fb47a9f0ce7fa95a0f28170b210'
* commit '768421daf5745fb47a9f0ce7fa95a0f28170b210':
change BT sample minsdkversion to 6 because it
2009-12-04 04:31:44 -08:00
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
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
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
20d2781801
am c5a640ee: Merge change Icce4f510 into eclair
...
Merge commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72' into eclair-plus-aosp
* commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72':
change BT sample minsdkversion to 6 because it
2009-12-03 18:15:33 -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
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
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
91b2d65eb9
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."
2009-12-03 16:44:41 -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
Megha Joshi
ce28b790e7
am eb34b45e: Revert "fixing build"
...
Merge commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd' into eclair-plus-aosp
* commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd':
Revert "fixing build"
2009-12-03 16:30:34 -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
830d30d524
am 7d1b833e: fixing build
...
Merge commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8' into eclair-plus-aosp
* commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8':
fixing build
2009-12-03 15:23:28 -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
f12dc8d51c
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.
2009-12-03 14:17:53 -08:00
Megha Joshi
b5ad157bab
adding set wallpaper sample code in ApiDemos.
2009-12-03 13:56:37 -08:00
Scott Main
015d891672
am 67203cca: add new Bluetooth sample app
...
Merge commit '67203cca65901d672803071bfc026c3657b85fdf' into eclair-plus-aosp
* commit '67203cca65901d672803071bfc026c3657b85fdf':
add new Bluetooth sample app
2009-12-03 10:24:24 -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
Scott Main
67203cca65
add new Bluetooth sample app
2009-12-02 16:27:00 -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
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
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
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