7161 Commits

Author SHA1 Message Date
Android (Google) Code Review
5c47265a70 Merge change Ibe6eac82
* changes:
  Implement Matrix Palette extension.
2009-12-08 20:13:44 -08:00
Jaikumar Ganesh
7279fb9aee am dbdabca7: am b08170ad: am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4'

* commit 'dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4':
  Add API to get Active Sinks.
2009-12-08 14:50:43 -08:00
Jack Palevich
be6eac828f Implement Matrix Palette extension.
Adds support for formerly-unimplemented methods:

glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES

The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.

This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)

Fixes bug 2308625 "Support matrix palette skinning
in JSR239 and related APIs"

Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:

a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.

b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
2009-12-08 15:43:51 +08:00
Vasu Nori
c65708ef6e am 976ed437: am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '976ed43786dcf078a0f802716d49644691656a24'

* commit '976ed43786dcf078a0f802716d49644691656a24':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 18:38:11 -08:00
Evan Millar
1588bedcd0 am 4adf8017: am b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit '4adf8017374c20f725400233fc7b039613c78caf'

* commit '4adf8017374c20f725400233fc7b039613c78caf':
  Add Sets#newSortedSet()
2009-12-07 18:37:57 -08:00
Leon Scroggins
05c92dbe7f am 0092ee13: am 6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '0092ee13e4490bbd8de522d256fb4d7dab81be60'

* commit '0092ee13e4490bbd8de522d256fb4d7dab81be60':
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 18:37:16 -08:00
Grace Kloba
6180977d11 am 8657978a: am ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit '8657978aabc7141869926a98a0da257255678dd4'

* commit '8657978aabc7141869926a98a0da257255678dd4':
  Expose onReceivedSslError() so that the WebView client
2009-12-07 18:37:00 -08:00
Grace Kloba
d234ad6205 am a49f91a2: am 14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit 'a49f91a2cb0cf39fa07d25ba896f5bf115b768e7'

* commit 'a49f91a2cb0cf39fa07d25ba896f5bf115b768e7':
  Add "res" support for WebView.
2009-12-07 18:36:32 -08:00
Daniel Sandler
0988fb3ff1 am 0128c250: am 1b15acf7: Merge change I21eb4b87 into eclair-mr2
Merge commit '0128c250e3a81e5d3793126ad82b2ce3c387a4ef'

* commit '0128c250e3a81e5d3793126ad82b2ce3c387a4ef':
  Allow room for descenders in am/pm text.
2009-12-07 18:35:36 -08:00
Eric Laurent
feab08b901 am e30bae7f: am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5'

* commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 18:33:53 -08:00
Leon Scroggins
4454ac7657 am 0b1a9f76: am 9e3e2d3a: Show search icon for <input type="search"> fields.
Merge commit '0b1a9f7648a9e57b0eaf6766f73810de94136669'

* commit '0b1a9f7648a9e57b0eaf6766f73810de94136669':
  Show search icon for <input type="search"> fields.
2009-12-07 18:31:58 -08:00
Maryam Garrett
081dd1cfd7 am 44e537a8: am 7c427030: Merge change I9088d29b into eclair-mr2
Merge commit '44e537a859966378f1599db5e5d41045e78efd94'

* commit '44e537a859966378f1599db5e5d41045e78efd94':
  Improves the touch-based text selection UI in text boxes.
2009-12-07 18:31:35 -08:00
Jaikumar Ganesh
dbdabca716 am b08170ad: am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'b08170ad7e4ca4908852b0e20759ea740b338a03' into eclair-mr2-plus-aosp

* commit 'b08170ad7e4ca4908852b0e20759ea740b338a03':
  Add API to get Active Sinks.
2009-12-07 15:57:28 -08:00
Jaikumar Ganesh
b08170ad7e am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-mr2

* commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
  Add API to get Active Sinks.
2009-12-07 15:53:02 -08:00
Android (Google) Code Review
ae88e2d130 Merge change I38227501 into eclair
* changes:
  Add API to get Active Sinks.
2009-12-07 15:49:50 -08:00
Jaikumar Ganesh
b16c4f7dd9 Add API to get Active Sinks.
Allow incoming connections only when there are no active sinks.

Dr No: Eastham
Bug: 2133530
2009-12-07 15:20:31 -08:00
Bjorn Bringert
c5303c3a55 am 8d962613: am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '8d962613464b206f4c0b2323607c5e248543ad24'

* commit '8d962613464b206f4c0b2323607c5e248543ad24':
  Move android.server.search.SearchableInfo to android.app
2009-12-07 14:58:38 -08:00
Vasu Nori
976ed43786 am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp

* commit '6be01bf207077ffbdcd3879250171a26ec805835':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:58:04 -08:00
Romain Guy
cd9d0242fd am 16c82c34: am d1b3988a: Merge change I4039545e into eclair-mr2
Merge commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f'

* commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f':
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-07 14:56:53 -08:00
Romain Guy
e8a43b2367 am e300deaf: am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8'

* commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8':
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-07 14:55:23 -08:00
Android (Google) Code Review
6be01bf207 Merge change Ifa1fae13 into eclair-mr2
* changes:
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:54:36 -08:00
Christopher Tate
0303edf957 am a26b0a40: am ed6dd2e6: am d3bc1994: Merge change I397b6a93 into eclair
Merge commit 'a26b0a401b6aadb45fa58d1d05b3112fbfda3fba'

* commit 'a26b0a401b6aadb45fa58d1d05b3112fbfda3fba':
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-07 14:52:56 -08:00
Evan Millar
4adf801737 am b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit 'b5eb3902ff92f895328928c6a8e05c90104e0c13' into eclair-mr2-plus-aosp

* commit 'b5eb3902ff92f895328928c6a8e05c90104e0c13':
  Add Sets#newSortedSet()
2009-12-07 14:45:43 -08:00
Android (Google) Code Review
b5eb3902ff Merge change Ie70845ca into eclair-mr2
* changes:
  Add Sets#newSortedSet()
2009-12-07 14:41:49 -08:00
Vasu Nori
fa1fae1355 Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
This reverts commit 6d1ec0d81cd8ecdd390b31e724bac554bb955a94.
2009-12-07 14:38:35 -08:00
Evan Millar
049070d365 Add Sets#newSortedSet() 2009-12-07 14:21:33 -08:00
Leon Scroggins
0092ee13e4 am 6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '6761e85d41dedf4e783217922a5fedac2b7a654d' into eclair-mr2-plus-aosp

* commit '6761e85d41dedf4e783217922a5fedac2b7a654d':
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 13:40:59 -08:00
Grace Kloba
8657978aab am ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit 'ddcea3d21645bb3037703c84807dae077aae62ce' into eclair-mr2-plus-aosp

* commit 'ddcea3d21645bb3037703c84807dae077aae62ce':
  Expose onReceivedSslError() so that the WebView client
2009-12-07 13:40:53 -08:00
Android (Google) Code Review
6761e85d41 Merge change Idff5eb2a into eclair-mr2
* changes:
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 13:39:22 -08:00
Leon Scroggins
aa7b9d7826 Set InputType of WebTextView according to <input> field's type.
Help fix http://b/issue?id=2150538 and http://b/issue?id=1890360

Use the <input type> information to set the InputType, so that
the IME can show the correct options.  Also consolidate setup
of WebTextView into setType().

Requires a change in external/webkit.
2009-12-07 16:36:34 -05:00
Grace Kloba
ddcea3d216 Expose onReceivedSslError() so that the WebView client
can accept the error and continue.

Fix http://b/issue?id=2299152
2009-12-07 13:20:33 -08:00
Grace Kloba
a49f91a2cb am 14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit '14467eb2eea119b4d71dd7dd149479aa092e6de2' into eclair-mr2-plus-aosp

* commit '14467eb2eea119b4d71dd7dd149479aa092e6de2':
  Add "res" support for WebView.
2009-12-07 13:09:49 -08:00
Android (Google) Code Review
14467eb2ee Merge change I234162b0 into eclair-mr2
* changes:
  Add "res" support for WebView.
2009-12-07 13:05:46 -08:00
Daniel Sandler
0128c250e3 am 1b15acf7: Merge change I21eb4b87 into eclair-mr2
Merge commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57' into eclair-mr2-plus-aosp

* commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57':
  Allow room for descenders in am/pm text.
2009-12-07 12:51:01 -08:00
Android (Google) Code Review
1b15acf705 Merge change I21eb4b87 into eclair-mr2
* changes:
  Allow room for descenders in am/pm text.
2009-12-07 12:46:56 -08:00
Grace Kloba
bd5c823e28 Add "res" support for WebView.
http://b/issue?id=2296839
2009-12-07 12:36:05 -08:00
Eric Laurent
e30bae7f8e am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1' into eclair-mr2-plus-aosp

* commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:06:15 -08:00
Eric Laurent
b8341cf7c8 am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:17 -08:00
Leon Scroggins
0b1a9f7648 am 9e3e2d3a: Show search icon for <input type="search"> fields.
Merge commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5' into eclair-mr2-plus-aosp

* commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5':
  Show search icon for <input type="search"> fields.
2009-12-07 07:39:06 -08:00
Leon Scroggins
9e3e2d3a69 Show search icon for <input type="search"> fields.
Along with a change to external/webkit, fixes http://b/issue?id=2299650
2009-12-07 10:21:41 -05:00
Maryam Garrett
44e537a859 am 7c427030: Merge change I9088d29b into eclair-mr2
Merge commit '7c42703082574638ecaa88ea18b0cc94bfabea2d' into eclair-mr2-plus-aosp

* commit '7c42703082574638ecaa88ea18b0cc94bfabea2d':
  Improves the touch-based text selection UI in text boxes.
2009-12-07 07:17:26 -08:00
Android (Google) Code Review
7c42703082 Merge change I9088d29b into eclair-mr2
* changes:
  Improves the touch-based text selection UI in text boxes.
2009-12-07 07:14:41 -08:00
Daniel Sandler
21eb4b8735 Allow room for descenders in am/pm text.
The lock screen clock layout was previously cropping them
off; in locales that use "PM" this is fine, but Spanish
(e.g.) uses "p.m."

Fixes http://b/2277477
2009-12-07 09:25:56 -05:00
Eric Laurent
9cc489a219 Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Fixed AudioFlinger::openInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to openOutput().
Modified RecordThread start procedure so that a failure occuring during the first read from audio input stream is detected and causes
the record start to fail.
Modified RecordThread stop procedure to make sure that audio input stream fd is closed before we exit the stop function.

Fixed AudioRecord JAVA and JNI implementation to take status of native AudioRecord::start() into account
and not change mRecordingState to RECORDSTATE_RECORDING if start fails.
2009-12-07 05:37:47 -08:00
Bjorn Bringert
8d96261346 am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '6dba0680cd3bc0bd987a3d01fc49421897528f20' into eclair-mr2-plus-aosp

* commit '6dba0680cd3bc0bd987a3d01fc49421897528f20':
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:26:04 -08:00
Android (Google) Code Review
6dba0680cd Merge change I9589f9c2 into eclair-mr2
* changes:
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:21:01 -08:00
Romain Guy
16c82c34ed am d1b3988a: Merge change I4039545e into eclair-mr2
Merge commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21' into eclair-mr2-plus-aosp

* commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21':
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-04 17:06:04 -08:00
Romain Guy
4039545ed6 Fire OnGroupClick events when collapsing a group in ExpandableListView. 2009-12-04 16:51:52 -08:00
Romain Guy
e300deaf2f am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'b6936607b61e3115b5924e41be29c0430dd05613' into eclair-mr2-plus-aosp

* commit 'b6936607b61e3115b5924e41be29c0430dd05613':
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:54:32 -08:00
Android (Google) Code Review
b6936607b6 Merge change If3c7d429 into eclair-mr2
* changes:
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:50:43 -08:00