Commit Graph

6279 Commits

Author SHA1 Message Date
Jason Sams
73fe9bf588 am d8f7a0e3: Merge change I7299c83b into eclair
Merge commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac' into eclair-plus-aosp

* commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac':
  Fix bug exposed by filmstrip.  The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
2009-10-16 15:19:16 -07:00
Android (Google) Code Review
7ee5449954 Merge change I7299c83b into eclair
* changes:
  Fix bug exposed by filmstrip.  The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
2009-10-16 17:56:29 -04:00
Mathias Agopian
babff10f03 am 69fba87a: Merge change I6fc56997 into eclair
Merge commit '69fba87ac16d1c10da81fc3213ae169c755797f4' into eclair-plus-aosp

* commit '69fba87ac16d1c10da81fc3213ae169c755797f4':
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 14:32:37 -07:00
Mathias Agopian
4830872d2f am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-plus-aosp

* commit '7bb7e99216956d917af1786a3e02a92cac46fc84':
  fix [2182249] [MR1] valgrind error in surface flinger
2009-10-16 14:32:27 -07:00
Scott Main
5d3cd06054 am 7f66dbce: Merge change Ic37381fb into eclair
Merge commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9' into eclair-plus-aosp

* commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9':
  docs: fix doc error in dialog example snippet
2009-10-16 14:32:17 -07:00
Android (Google) Code Review
031a1dc6d8 Merge change I6fc56997 into eclair
* changes:
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 17:26:55 -04:00
Android (Google) Code Review
76f95d0caf Merge change Ia8ac904d into eclair
* changes:
  fix [2182249] [MR1] valgrind error in surface flinger
2009-10-16 17:26:15 -04:00
Android (Google) Code Review
8a601f3795 Merge change Ic37381fb into eclair
* changes:
  docs: fix doc error in dialog example snippet
2009-10-16 17:23:11 -04:00
Suchi Amalapurapu
e4b2624ba8 am c75348a9: Merge change Ib897cff1 into eclair
Merge commit 'c75348a9384a5310bb34bf02cafd0076630f4a28' into eclair-plus-aosp

* commit 'c75348a9384a5310bb34bf02cafd0076630f4a28':
  do not merge
2009-10-16 12:46:31 -07:00
Android (Google) Code Review
e48d115ba2 Merge change Ib897cff1 into eclair
* changes:
  do not merge Return valid package info for packages that have been uninstalled with an option to retain data and resources using the flag GET_UNINSTALLED_PACKAGES These packages do not have a package setting. just check the flag and return the required info from PackageParser.generatePackageInfo
2009-10-16 15:36:40 -04:00
Mike Lockwood
5698d49cbc am 0b08abe1: Merge change I9521cf8b into eclair
Merge commit '0b08abe1b8e4f49cfaefb8226696664ad3d5ca6a' into eclair-plus-aosp

* commit '0b08abe1b8e4f49cfaefb8226696664ad3d5ca6a':
  Register for light sensor events if non-hardware based auto-brightnees is enabled
2009-10-16 09:37:35 -07:00
Mike Lockwood
0e1a80af9d am f55aa972: Merge change I01935be3 into eclair
Merge commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542' into eclair-plus-aosp

* commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:37:25 -07:00
Android (Google) Code Review
dfaab0d35b Merge change I9521cf8b into eclair
* changes:
  Register for light sensor events if non-hardware based auto-brightnees is enabled
2009-10-16 12:29:39 -04:00
Android (Google) Code Review
cc6581660f Merge change I01935be3 into eclair
* changes:
  Remove PowerManager.setAutoBrightness()
2009-10-16 12:29:15 -04:00
Cary Clark
386d3a21c4 am 39e67734: do not merge: fix copy/paste using trackball on passion
Merge commit '39e6773431e6010c5066c0e13facfd943c932c7e' into eclair-plus-aosp

* commit '39e6773431e6010c5066c0e13facfd943c932c7e':
  do not merge: fix copy/paste using trackball on passion
2009-10-16 07:12:37 -07:00
Dave Sparks
24120130ce am b9a22122: Merge change I0e09e56f into eclair
Merge commit 'b9a22122b08d749368f90128e29aff035031f8db' into eclair-plus-aosp

* commit 'b9a22122b08d749368f90128e29aff035031f8db':
  Don't callback on NULL client. Bug 2180510.
2009-10-15 22:25:24 -07:00
Android (Google) Code Review
3f205ecfac Merge change I0e09e56f into eclair
* changes:
  Don't callback on NULL client. Bug 2180510.
2009-10-16 01:19:10 -04:00
Joe Onorato
0e4acab744 am 034cd0be: Merge change I486fdb55 into eclair
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
2009-10-15 20:39:19 -07:00
Android (Google) Code Review
2c037df204 Merge change I486fdb55 into eclair
* changes:
  Fix bug 2183179 - Hitting the back key repeatedly makes the notification shade jump up and down
2009-10-15 23:32:39 -04:00
Jason Sams
58d28ea257 am 4f1d7656: Merge change I741a6100 into eclair
Merge commit '4f1d765699b1be320d49530313b750a4d153a0bb' into eclair-plus-aosp

* commit '4f1d765699b1be320d49530313b750a4d153a0bb':
  Fix bug where dirty messages for allocations attached to programVertex objects could be lost.
2009-10-15 19:10:20 -07:00
Mike Lockwood
be08a19826 am 37a13208: Add separate configuration flag for hardware ALS support.
Merge commit '37a13208c93bbe00cf233baf1ebcd6e081972a27' into eclair-plus-aosp

* commit '37a13208c93bbe00cf233baf1ebcd6e081972a27':
  Add separate configuration flag for hardware ALS support.
2009-10-15 19:10:12 -07:00
Jason Sams
eac2fde579 am 41c19db9: 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 '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.
2009-10-15 19:10:00 -07:00
Android (Google) Code Review
bff2e7d7f7 Merge change I741a6100 into eclair
* changes:
  Fix bug where dirty messages for allocations attached to programVertex objects could be lost.
2009-10-15 21:47:03 -04:00
Mathias Agopian
38a7fa2ae3 fix [2182249] [MR1] valgrind error in surface flinger 2009-10-15 18:08:15 -07:00
Jason Sams
bba4dc0135 am c7412b3b: Minor bug fixes and add glError check.
Merge commit 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2' into eclair-plus-aosp

* commit 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2':
  Minor bug fixes and add glError check.
2009-10-15 16:17:38 -07:00
Jason Sams
a0fbb5f2b0 am 6a17e163: Add egl init start message to help debug driver init hangs.
Merge commit '6a17e163a0dca28c1b2f957561e909172b7259c8' into eclair-plus-aosp

* commit '6a17e163a0dca28c1b2f957561e909172b7259c8':
  Add egl init start message to help debug driver init hangs.
2009-10-15 16:17:30 -07:00
jsh
1fca840c73 am 2a39758e: Merge change I51d41230 into eclair
Merge commit '2a39758ecb315a77f05800cc04f7ca65954c9026' into eclair-plus-aosp

* commit '2a39758ecb315a77f05800cc04f7ca65954c9026':
  Make sure CF icon updates when using "all CF" MMI.
2009-10-15 15:56:43 -07:00
Android (Google) Code Review
cc4366deb8 Merge change I51d41230 into eclair
* changes:
  Make sure CF icon updates when using "all CF" MMI.
2009-10-15 18:49:44 -04:00
Romain Guy
cef1e9b9fb am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-plus-aosp

* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 15:42:04 -07:00
Android (Google) Code Review
156a67e55e Merge change I0d74deb6 into eclair
* changes:
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 18:33:12 -04:00
Dave Sparks
393eb7967f Don't callback on NULL client. Bug 2180510.
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.
2009-10-15 15:18:08 -07:00
Guang Zhu
c23269e19a am 9e58e642: Enable some tests that requires local http server
Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-plus-aosp

* commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd':
  Enable some tests that requires local http server
2009-10-15 12:01:44 -07:00
Scott Main
c696b326d4 am 30a6657e: Merge change Ic9b31801 into eclair
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...
2009-10-14 18:01:59 -07:00
Android (Google) Code Review
39c999a537 Merge change Ic9b31801 into eclair
* 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.
2009-10-14 20:52:50 -04:00
Nick Pelly
aa72238b7c am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-plus-aosp

* commit '53f33d84776a0bad668e361365a7049b16f8a929':
  Revert "Remove STOPSHIP comment."
2009-10-14 12:37:02 -07:00
Jean-Baptiste Queru
3801d32d8c merge from open-source master 2009-10-14 12:26:31 -07:00
Nick Pelly
059490a49b am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-plus-aosp

* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
  Remove STOPSHIP comment.
2009-10-14 12:03:58 -07:00
Android (Google) Code Review
f7f46955f7 Merge change I2492bffe into eclair
* changes:
  Remove STOPSHIP comment.
2009-10-14 14:55:44 -04:00
Katarina Stenstedt
5d58d4de74 am 399fc263: Merge change If30c5e20 into eclair
Merge commit '399fc2636f1332986f319df3cf8ae56344070c51' into eclair-plus-aosp

* commit '399fc2636f1332986f319df3cf8ae56344070c51':
  SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
2009-10-14 10:08:42 -07:00
Android (Google) Code Review
bf89a25446 Merge change If30c5e20 into eclair
* changes:
  SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial. Changed image links to use @docRoot.
2009-10-14 12:52:00 -04:00
Mathias Agopian
618fa10949 fix [2187212] add support for GLESv2 dispatch based on TLS
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]
2009-10-14 02:06:37 -07:00
Dmitri Plotnikov
98cb8888a4 am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6' into eclair-plus-aosp

* commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6':
  Making new Contacts APIs visible in Eclair SDK - Part II
2009-10-14 00:47:52 -07:00
Dave Sparks
c788a3feda am 8c471d1d: Merge change I4ef3e82f into eclair
Merge commit '8c471d1def1027d025528b419cc8a1cdb68a4489' into eclair-plus-aosp

* commit '8c471d1def1027d025528b419cc8a1cdb68a4489':
  7 more ringtones. Now with more Dr. No!
2009-10-14 00:20:57 -07:00
Android (Google) Code Review
90e1850c05 Merge change I4ef3e82f into eclair
* changes:
  7 more ringtones. Now with more Dr. No!
2009-10-14 03:13:12 -04:00
Dianne Hackborn
0f23db6326 am cbf77e9b: Merge change I875200fe into eclair
Merge commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13' into eclair-plus-aosp

* commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13':
  Another fix for #2186897: Cannot unlock the device by swiping
2009-10-13 23:00:28 -07:00
Android (Google) Code Review
d6e991e167 Merge change I875200fe into eclair
* changes:
  Another fix for #2186897: Cannot unlock the device by swiping
2009-10-14 01:51:00 -04:00
Dianne Hackborn
bd2a87b004 am b10e2f1a: Merge change Iac534225 into eclair
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-plus-aosp

* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
  Fix issue #2186709: Can't unlock the device for a while
2009-10-13 20:21:11 -07:00
Android (Google) Code Review
f1e8da6637 Merge change Iac534225 into eclair
* changes:
  Fix issue #2186709: Can't unlock the device for a while
2009-10-13 23:13:37 -04:00
Dmitri Plotnikov
80b06559bc am 6e144ad8: Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-plus-aosp

* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
  Making new Contacts APIs visible in Eclair SDK
2009-10-13 18:47:56 -07:00
Jeff Sharkey
be7c71921f am a78a9d4c: Correct non-opaque list separator assets.
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-plus-aosp

* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
  Correct non-opaque list separator assets.
2009-10-13 18:05:48 -07:00