Commit Graph

14682 Commits

Author SHA1 Message Date
Jack Palevich
6ae4da7542 Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context
Provide a new method, GLSurfaceView.setEGLContextClientVersion. Clients
call this method to define which level of OpenGL ES support they want.

This method only affects the default behavior of GLSurfaceView. If clients
have supplied their own EGLContextFactory or EGLConfigChooser then they
are on their own if they want to create an OpenGL ES 2.0 context.

This API is currently hidden.

Update the gl2_java test to use this new API.

Update the gl2_java test's AndroidManifest.xml file to indicate that
it requires OpenGL ES 2.0.
2009-11-19 19:08:52 +08:00
Jack Palevich
560814f6b1 Add a Java API for OpenGL ES 2.0.
Currently this API is hidden.

Add a test program.
2009-11-19 16:34:55 +08:00
Eric Fischer
f9cf96ae1d am 1f60ff34: am e45ebbaf: am 04a0e969: Merge change Id7c432bf into eclair
Merge commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06'

* commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 18:11:48 -08:00
Daisuke Miyakawa
18b5fc06af am 7798d36a: am d2f813c3: Merge change I60cfe9ce into eclair-mr2
Merge commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8'

* commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8':
  Add unit tests.
2009-11-17 18:11:19 -08:00
Jason Sams
644a0e320d resolved conflicts for merge of f6309041 to master 2009-11-17 18:07:54 -08:00
Eric Fischer
1f60ff34cd am e45ebbaf: am 04a0e969: Merge change Id7c432bf into eclair
Merge commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435' into eclair-mr2-plus-aosp

* commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:59:09 -08:00
Eric Fischer
e45ebbaf1b am 04a0e969: Merge change Id7c432bf into eclair
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-mr2

* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:54:31 -08:00
Android (Google) Code Review
04a0e969c6 Merge change Id7c432bf into eclair
* changes:
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:51:37 -08:00
Jaikumar Ganesh
e30c29feea am bc9f6292: am 4fea2919: am 660282dc: Merge change I706fe6b0 into eclair
Merge commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d'

* commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:45:22 -08:00
Daisuke Miyakawa
7798d36a46 am d2f813c3: Merge change I60cfe9ce into eclair-mr2
Merge commit 'd2f813c3f85060d42744be2632fed20f520001ee' into eclair-mr2-plus-aosp

* commit 'd2f813c3f85060d42744be2632fed20f520001ee':
  Add unit tests.
2009-11-17 17:41:17 -08:00
Jason Sams
f630904134 am f56f317f: am fa0394c9: Merge change I715333b8 into eclair
Merge commit 'f56f317fb941c354c3a10e9fbf36d194656fa7d4' into eclair-mr2-plus-aosp

* commit 'f56f317fb941c354c3a10e9fbf36d194656fa7d4':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:41:02 -08:00
Jaikumar Ganesh
bc9f62920a am 4fea2919: am 660282dc: Merge change I706fe6b0 into eclair
Merge commit '4fea2919abeba149376fed98a14e3ffc8464eadf' into eclair-mr2-plus-aosp

* commit '4fea2919abeba149376fed98a14e3ffc8464eadf':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:40:45 -08:00
Android (Google) Code Review
d2f813c3f8 Merge change I60cfe9ce into eclair-mr2
* changes:
  Add unit tests.
2009-11-17 17:38:07 -08:00
Jason Sams
f56f317fb9 am fa0394c9: Merge change I715333b8 into eclair
Merge commit 'fa0394c9f89f13b53c6db2470253825b88cafb64' into eclair-mr2

* commit 'fa0394c9f89f13b53c6db2470253825b88cafb64':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:35:44 -08:00
Daisuke Miyakawa
839c036444 Add unit tests.
Internal issue number: 2195990
2009-11-18 10:35:39 +09:00
Jaikumar Ganesh
4fea2919ab am 660282dc: Merge change I706fe6b0 into eclair
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-mr2

* commit '660282dc3e81784224945be0787a9e2d4276de8c':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:35:25 -08:00
Android (Google) Code Review
fa0394c9f8 Merge change I715333b8 into eclair
* changes:
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:31:58 -08:00
Jason Sams
715333b832 Add support for dumping RS objects to aid in debugging of white blocks bug. 2009-11-17 17:26:46 -08:00
Eric Fischer
d7c432bf7f Add vertical bar to the alt-space character picker for the hardware keyboard.
Bug 2242177

Approver: jerryw
2009-11-17 16:28:30 -08:00
Evan Millar
813d11a91a am a6780991: am e53c9a81: am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit 'a67809918f6c212630da0b359628d0e8722b091f'

* commit 'a67809918f6c212630da0b359628d0e8722b091f':
  Move photo querying off main thread.
2009-11-17 16:14:15 -08:00
Ray Chen
78bcc8660e am edc1b064: am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair
Merge commit 'edc1b064ee1da7bca9d9a6114e984962b2633530'

* commit 'edc1b064ee1da7bca9d9a6114e984962b2633530':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 16:13:57 -08:00
Joe Onorato
8470924a6d am 95230656: am 0036b4de: am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit '95230656e46ee7e236f6bb02de1334659a2d1244'

* commit '95230656e46ee7e236f6bb02de1334659a2d1244':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 16:13:37 -08:00
Mark Wagner
69020b7325 am fe537b3f: am 0e3fccf1: Merge change Icef599ec into eclair-mr2
Merge commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5'

* commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5':
  null check
2009-11-17 16:13:16 -08:00
Android (Google) Code Review
660282dc3e Merge change I706fe6b0 into eclair
* changes:
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 16:07:58 -08:00
Evan Millar
a67809918f am e53c9a81: am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af' into eclair-mr2-plus-aosp

* commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af':
  Move photo querying off main thread.
2009-11-17 16:05:58 -08:00
Ray Chen
edc1b064ee am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair
Merge commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc' into eclair-mr2-plus-aosp

* commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 16:05:43 -08:00
Joe Onorato
95230656e4 am 0036b4de: am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit '0036b4def5242429abdf6e8e420896eb5296316e' into eclair-mr2-plus-aosp

* commit '0036b4def5242429abdf6e8e420896eb5296316e':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 16:05:27 -08:00
Mark Wagner
fe537b3fe4 am 0e3fccf1: Merge change Icef599ec into eclair-mr2
Merge commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1' into eclair-mr2-plus-aosp

* commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1':
  null check
2009-11-17 16:05:12 -08:00
Andreas Huber
4788b3148b am 39dc5104: am 2c766498: Merge change Iea6a38c6 into eclair-mr2
Merge commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916'

* commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916':
  Squashed commit of the following:
2009-11-17 15:10:44 -08:00
Andreas Huber
3fc9f51494 am ed9880f3: am a35f1c63: Merge change Ib64ea2dd into eclair-mr2
Merge commit 'ed9880f399015782c9f635db744d25281d0deeb4'

* commit 'ed9880f399015782c9f635db744d25281d0deeb4':
  Improvements to TimedEventQueue.
2009-11-17 15:10:25 -08:00
Andreas Huber
4ed0fab49d am 775508d9: am 744043fc: Update FileSource to also accept a file descriptor and a range.
Merge commit '775508d97f709e621f9d1540aca819224fbdcebf'

* commit '775508d97f709e621f9d1540aca819224fbdcebf':
  Update FileSource to also accept a file descriptor and a range.
2009-11-17 15:10:07 -08:00
Daisuke Miyakawa
ead23abbd6 am 50963b1a: am 8c808187: Modify test code a little.
Merge commit '50963b1aa5c2828b46a4e0acf7626b8aef83ef68'

* commit '50963b1aa5c2828b46a4e0acf7626b8aef83ef68':
  Modify test code a little.
2009-11-17 15:08:08 -08:00
Daisuke Miyakawa
c1df1ddc3b am a4d3fae7: am a184d4b9: Merge change I11526e6c into eclair-mr2
Merge commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb'

* commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb':
  Clean up codes and remove/modify stale codes/comments.
2009-11-17 15:07:49 -08:00
Jim Miller
c0c999a43c am 8bf56e6a: am c0b0ad21: am f0166e4d: Merge change I4f01d4a4 into eclair
Merge commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6'

* commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6':
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-17 15:06:41 -08:00
Daisuke Miyakawa
675cab9240 am feef7de2: am ac3e2159: Merge change Icaf78440 into eclair-mr2
Merge commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c'

* commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c':
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-17 15:06:00 -08:00
Mike Lockwood
1ef8c8f155 am 11c89c48: am 0d829149: am f8c4af65: Merge change I51b84496 into eclair
Merge commit '11c89c48281dd75da20b0649e5b6e19b057901eb'

* commit '11c89c48281dd75da20b0649e5b6e19b057901eb':
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-17 15:05:05 -08:00
Evan Millar
e53c9a81e5 am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-mr2

* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
  Move photo querying off main thread.
2009-11-17 14:45:13 -08:00
Android (Google) Code Review
6bcd99c2a6 Merge change I1b6d202b into eclair
* changes:
  Move photo querying off main thread.
2009-11-17 14:40:40 -08:00
Ray Chen
ae9dd9b77d am b3f35041: Merge change I86db22ef into eclair
Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-mr2

* commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:28:18 -08:00
Android (Google) Code Review
b3f35041aa Merge change I86db22ef into eclair
* changes:
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:23:36 -08:00
Joe Onorato
0036b4def5 am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871' into eclair-mr2

* commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 14:10:12 -08:00
Android (Google) Code Review
0e3fccf1a5 Merge change Icef599ec into eclair-mr2
* changes:
  null check
2009-11-17 14:09:14 -08:00
Mark Wagner
cef599ec8c null check 2009-11-17 13:58:07 -08:00
Evan Millar
1b6d202bd4 Move photo querying off main thread.
Fixes bug http://b/issue?id=2265642
2009-11-17 12:07:41 -08:00
Scott Main
9c9e67aca4 resolved conflicts for merge of bc1add83 to master 2009-11-17 11:13:31 -08:00
Andreas Huber
39dc51040f am 2c766498: Merge change Iea6a38c6 into eclair-mr2
Merge commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be' into eclair-mr2-plus-aosp

* commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be':
  Squashed commit of the following:
2009-11-17 10:50:22 -08:00
Android (Google) Code Review
2c7664989f Merge change Iea6a38c6 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-11-17 10:46:41 -08:00
Joe Onorato
df7dbb68d3 Fix bug 2252145 - Notification panel not closing completely when a call comes in 2009-11-17 10:43:37 -08:00
Ray Chen
05df33ea74 Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database. 2009-11-17 10:42:01 -08:00
Andreas Huber
ed9880f399 am a35f1c63: Merge change Ib64ea2dd into eclair-mr2
Merge commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398' into eclair-mr2-plus-aosp

* commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398':
  Improvements to TimedEventQueue.
2009-11-17 10:40:59 -08:00