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

257 Commits

Author SHA1 Message Date
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
Scott Main
e71c282812 am 1558abd6: Merge change I53e268db into eclair-sdk 
Merge commit '1558abd6d3706380cf4634c151ee7952e0b317fb' into eclair

* commit '1558abd6d3706380cf4634c151ee7952e0b317fb':
  docs: make the apidemos app index page only display the
 2009-11-23 10:07:10 -08:00
Roman Nurik
d7f64d5338 Add Multiple Resolutions (MultiRes) sample code. 2009-11-23 11:44:11 -05:00
Scott Main
ea6c4f9082 docs: make the apidemos app index page only display the 
shortcut links when the docs are online, because these
links will not resolve when the docs are offline.

this is a silly hack, but a temporary one until these
samples are moved.

Change-Id: I53e268db265cec143ca5e561ca2d6b4df3dba3e2
 2009-11-20 14:55:07 -08:00
Android Git Automerger
c4d593fa6a am fc6e75e5: am 228bbae1: am e259566c: Put this change back, false alert with build breakage 
Merge commit 'fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0'

* commit 'fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0':
  Put this change back, false alert with build breakage
 2009-11-13 13:15:32 -08:00
Android Git Automerger
fc6e75e533 am 228bbae1: am e259566c: Put this change back, false alert with build breakage 
Merge commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b' into eclair-mr2-plus-aosp

* commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b':
  Put this change back, false alert with build breakage
 2009-11-13 13:11:09 -08:00
Android Git Automerger
228bbae1e3 am e259566c: Put this change back, false alert with build breakage 
Merge commit 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-mr2

* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
  Put this change back, false alert with build breakage
 2009-11-13 13:06:11 -08:00
Android Git Automerger
e259566cef Put this change back, false alert with build breakage 
This reverts commit a9046e418e.
 2009-11-13 12:26:06 -08:00
Android Git Automerger
0b90f4024d am 2c97ad64: am 0bf9cdf5: am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly." 
Merge commit '2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d'

* commit '2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d':
  Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
 2009-11-13 11:58:41 -08:00
Android Git Automerger
2c97ad648c am 0bf9cdf5: am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly." 
Merge commit '0bf9cdf569c9e34704e5dad6e858aa8cb8f6a5bb' into eclair-mr2-plus-aosp

* commit '0bf9cdf569c9e34704e5dad6e858aa8cb8f6a5bb':
  Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
 2009-11-13 11:55:32 -08:00
Android Git Automerger
0bf9cdf569 am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly." 
Merge commit 'a9046e418e539e208af6f3723a513666074ec6a1' into eclair-mr2

* commit 'a9046e418e539e208af6f3723a513666074ec6a1':
  Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
 2009-11-13 11:50:47 -08:00
Android Git Automerger
a9046e418e Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly." 
This reverts commit 18e1486a27.
 2009-11-13 11:40:40 -08:00
Jason Sams
909ea23248 am 5a571291: am 0c0d7d25: am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly. 
Merge commit '5a571291d38723cc4789bd864b24aa7009b642e6'

* commit '5a571291d38723cc4789bd864b24aa7009b642e6':
  Remove surface from rs init and handle surfaceChanged correctly.
 2009-11-12 23:20:39 -08:00
Jason Sams
5a571291d3 am 0c0d7d25: am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly. 
Merge commit '0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5' into eclair-mr2-plus-aosp

* commit '0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5':
  Remove surface from rs init and handle surfaceChanged correctly.
 2009-11-12 23:14:43 -08:00
Jason Sams
0c0d7d25fd am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly. 
Merge commit '18e1486a2749055414579f487b125021eb79b8ca' into eclair-mr2

* commit '18e1486a2749055414579f487b125021eb79b8ca':
  Remove surface from rs init and handle surfaceChanged correctly.
 2009-11-12 23:07:33 -08:00
Jason Sams
18e1486a27 Remove surface from rs init and handle surfaceChanged correctly. 2009-11-12 15:08:27 -08:00
Marco Nelissen
75c64ade6a am 0badc7f8: am 81515abc: am 42c35199: Update live wallpaper examples to new api. 
Merge commit '0badc7f8c3b3fb83d5556da8b9733b4e7b7b419a'

* commit '0badc7f8c3b3fb83d5556da8b9733b4e7b7b419a':
  Update live wallpaper examples to new api.
 2009-11-09 19:44:11 -08:00
Marco Nelissen
0badc7f8c3 am 81515abc: am 42c35199: Update live wallpaper examples to new api. 
Merge commit '81515abca85e742584db3c7cdacc5b840f0eb650' into eclair-mr2-plus-aosp

* commit '81515abca85e742584db3c7cdacc5b840f0eb650':
  Update live wallpaper examples to new api.
 2009-11-09 19:40:25 -08:00
Marco Nelissen
81515abca8 am 42c35199: Update live wallpaper examples to new api. 
Merge commit '42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-mr2

* commit '42c35199db9b3ec2ec467f926538e5d748e0b49d':
  Update live wallpaper examples to new api.
 2009-11-09 19:36:46 -08:00
Marco Nelissen
42c35199db Update live wallpaper examples to new api. 2009-11-09 15:45:02 -08:00
Derek Sollenberger
c8b30928b3 am c3e07f9d: am 606fe528: Merge change Ib4a23918 into eclair-mr2 
Merge commit 'c3e07f9d442ba097f264777693938b781e290da4'

* commit 'c3e07f9d442ba097f264777693938b781e290da4':
  Updating sample plugin to test java class loading.
 2009-11-09 14:14:38 -08:00