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

277 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
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
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
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
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
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
Roman Nurik
2c522fa3b7 am ea6616ac: am f28c33b6: Merge change I4ba0290a into eclair 
Merge commit 'ea6616ac3d733b1627d5addc9c62412d53dd1c26' into eclair-mr2-plus-aosp

* commit 'ea6616ac3d733b1627d5addc9c62412d53dd1c26':
  Add Multiple Resolutions (MultiRes) sample code.
 2009-11-23 13:53:42 -08:00
Roman Nurik
ea6616ac3d am f28c33b6: Merge change I4ba0290a into eclair 
Merge commit 'f28c33b6ec3401537a386995e2ec13fbc65c1957' into eclair-mr2

* commit 'f28c33b6ec3401537a386995e2ec13fbc65c1957':
  Add Multiple Resolutions (MultiRes) sample code.
 2009-11-23 13:51:01 -08:00
Android (Google) Code Review
f28c33b6ec Merge change I4ba0290a into eclair 
* changes:
  Add Multiple Resolutions (MultiRes) sample code.
 2009-11-23 13:45:14 -08:00
Scott Main
d75bfa57d6 am 75239b51: am 21acc900: am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk 
Merge commit '75239b51770825ea3da2673d4b81be1676145d51'

* commit '75239b51770825ea3da2673d4b81be1676145d51':
  docs: make the apidemos app index page only display the
 2009-11-23 10:24:12 -08:00
Scott Main
75239b5177 am 21acc900: am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk 
Merge commit '21acc90055935d052e350fe441091091c2421010' into eclair-mr2-plus-aosp

* commit '21acc90055935d052e350fe441091091c2421010':
  docs: make the apidemos app index page only display the
 2009-11-23 10:18:24 -08:00
Scott Main
21acc90055 am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk 
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2

* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
  docs: make the apidemos app index page only display the
 2009-11-23 10:13:44 -08:00