LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,427 Commits 2 Branches 0 Tags
7d40a18f3fdbd40ece35b0714b30a26e2bb7cb67
Commit Graph

3427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Sollenberger
7d40a18f3f am 2823d675: am e8454e79: updating sample plugin to use new full screen interfaces. 
Merge commit '2823d675626ead99e00dcf9958fda80c766b7f5b'

* commit '2823d675626ead99e00dcf9958fda80c766b7f5b':
  updating sample plugin to use new full screen interfaces.
 2009-12-09 16:26:09 -08:00
Dianne Hackborn
7466716279 am d564588d: am 579c7f19: Reorganize Service API demos. 
Merge commit 'd564588d7dd6975e13037af5cec6c33f52c9e55d'

* commit 'd564588d7dd6975e13037af5cec6c33f52c9e55d':
  Reorganize Service API demos.
 2009-12-09 16:26:02 -08:00
Andrew Stadler
e54051d957 resolved conflicts for merge of e85c304f to master 2009-12-09 16:10:02 -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
Jack Palevich
fe8c16afe6 Simple Matrix Palette skinning sample. 2009-12-09 15:32:35 +08:00
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
Marco Nelissen
45d9819638 am 92f95ee3: am bd642f3e: Make the simulator use alsa instead of esound. 
Merge commit '92f95ee3fb30ed86fb0b9e080551552448b511ae'

* commit '92f95ee3fb30ed86fb0b9e080551552448b511ae':
  Make the simulator use alsa instead of esound.
 2009-12-08 14:51:04 -08:00
Derek Sollenberger
e8454e7969 updating sample plugin to use new full screen interfaces. 2009-12-08 08:11:33 -05: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
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
David 'Digit' Turner
d8ec4b51cb am cc3d3913: am 85f5c420: am e8d64956: Merge change I6b913ab8 into eclair 
Merge commit 'cc3d39135124776ca2d36d6e973bc5b332fa9cbf'

* commit 'cc3d39135124776ca2d36d6e973bc5b332fa9cbf':
  Fix toolchain scripts for Darwin and Cygwin.
 2009-12-07 14:57:29 -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
Marco Nelissen
caf9771fb2 am 1009e293: am ac2a5cf7: Fix fake timing. 
Merge commit '1009e293d06026e9fb9240ad29308daebdf68236'

* commit '1009e293d06026e9fb9240ad29308daebdf68236':
  Fix fake timing.
 2009-12-07 14:53:55 -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
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
Andrew Stadler
e72e57edbc am f9c2e07d: am 21b8dbe5: Merge change Ia8c35b58 into eclair-mr2 
Merge commit 'f9c2e07d2cb65271d8def8d5562ecba52f69fd91'

* commit 'f9c2e07d2cb65271d8def8d5562ecba52f69fd91':
  Track library changes
 2009-12-04 04:31:13 -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
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
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