Merge commit '39e6773431e6010c5066c0e13facfd943c932c7e' into eclair-plus-aosp
* commit '39e6773431e6010c5066c0e13facfd943c932c7e':
do not merge: fix copy/paste using trackball on passion
Merge commit '034cd0be57d76b3bf5c7a3c118f6f10e67755772' into eclair-plus-aosp
* commit '034cd0be57d76b3bf5c7a3c118f6f10e67755772':
Fix bug 2183179 - Hitting the back key repeatedly makes the notification shade jump up and down
Merge commit '4f1d765699b1be320d49530313b750a4d153a0bb' into eclair-plus-aosp
* commit '4f1d765699b1be320d49530313b750a4d153a0bb':
Fix bug where dirty messages for allocations attached to programVertex objects could be lost.
Merge commit '37a13208c93bbe00cf233baf1ebcd6e081972a27' into eclair-plus-aosp
* commit '37a13208c93bbe00cf233baf1ebcd6e081972a27':
Add separate configuration flag for hardware ALS support.
Merge commit '41c19db90e250e2b7cb438904f0e96a0ef455d6d' into eclair-plus-aosp
* commit '41c19db90e250e2b7cb438904f0e96a0ef455d6d':
Remove hack in RS that called exit to WAR now fixed driver bugs. Make gloabal init safe by locking around the critical code.
Merge commit 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2' into eclair-plus-aosp
* commit 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2':
Minor bug fixes and add glError check.
Merge commit '2a39758ecb315a77f05800cc04f7ca65954c9026' into eclair-plus-aosp
* commit '2a39758ecb315a77f05800cc04f7ca65954c9026':
Make sure CF icon updates when using "all CF" MMI.
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-plus-aosp
* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
Fix possible NPE in the code that restores widgets' state.
We weren't checking to see if there was a valid camera client when
calling the notify callback function. Now we grab a strong pointer
before the callback to guarantee that the client is not destroyed
before we complete the callback. This change also fixes other
places in the code where we weren't holding a local strong pointer.
Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-plus-aosp
* commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd':
Enable some tests that requires local http server
Merge commit '30a6657ec6051ba5a1c72a714c9dc535dff127a4' into eclair-plus-aosp
* commit '30a6657ec6051ba5a1c72a714c9dc535dff127a4':
docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...
* changes:
docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0... move upgrading doc into a new guide for "updating" with the new manager tools and remove the previous updating doc from the dev guide. set up preliminary download page and guide for installing the full SDK. add the requirements doc in sdk/ for all general purposes. revise the download 'thank you' message.
Merge commit '399fc2636f1332986f319df3cf8ae56344070c51' into eclair-plus-aosp
* commit '399fc2636f1332986f319df3cf8ae56344070c51':
SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
Instead of using a different function pointer table for ES 1.x and ES 2.x,
we use a single one that is the union (sort|uniq) of both tables. Two
instances of this table are initialized with pointers to GL ES 1.x and GL ES 2.x
entry-points.
When a context is created, we store its version number and when it is bound to a
thread we set the approruiate table based on the stored version.
This introduce no penalty while dispatching gl calls to the right API version.
[Pending Dr No approval for MR1]
Merge commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6' into eclair-plus-aosp
* commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6':
Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit '8c471d1def1027d025528b419cc8a1cdb68a4489' into eclair-plus-aosp
* commit '8c471d1def1027d025528b419cc8a1cdb68a4489':
7 more ringtones. Now with more Dr. No!
Merge commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13' into eclair-plus-aosp
* commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13':
Another fix for #2186897: Cannot unlock the device by swiping
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-plus-aosp
* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
Fix issue #2186709: Can't unlock the device for a while
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-plus-aosp
* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
Making new Contacts APIs visible in Eclair SDK
Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-plus-aosp
* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
Futher reduce the logging of EriManager.
Merge commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-plus-aosp
* commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
Work on issue #2144454: Inconsistent swipes...
Merge commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-plus-aosp
* commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
Add a little logging to diagnose wifi cycle bug
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-plus-aosp
* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
Throttle camera preview frames to the app. Bug 2180302.
Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-plus-aosp
* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
Continue caching "POST" result so that we won't get
Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-plus-aosp
* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
Make standard roaming indicator display indications configurable
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-plus-aosp
* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
Reduce the amount of EriManager Logging.
