Commit Graph

5219 Commits

Author SHA1 Message Date
Android (Google) Code Review
7617b917b8 Merge change If68c168d into eclair-mr2
* changes:
  Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
2009-10-21 18:17:01 -04:00
Android (Google) Code Review
e20e6f9f0e Merge change If1e1fb39 into eclair-mr2
* changes:
  Draw dividers between <optgroup> and <option> elements.
2009-10-21 14:15:54 -04:00
Android (Google) Code Review
48904353c2 Merge change Ifcafa460 into eclair-mr2
* changes:
  fix multiple text areas, and text areas without focus rings
2009-10-21 14:14:46 -04:00
Android (Google) Code Review
f36de8c2e0 Merge change Ie5df08ef into eclair-mr2
* changes:
  Let PLUS occur once anywhere in dial-str network portion.
2009-10-21 03:27:14 -04:00
Android (Google) Code Review
6e3a012304 Merge change Ib3b06fc3 into eclair-mr2
* changes:
  It turns out to be useful to allow enumeration on a per-tag basis, and it's easy to support based on the data structures we have, so add a tag parameter to getNextEvent().
2009-10-20 16:23:01 -04:00
Android (Google) Code Review
010891dc43 Merge change I4958d608 into eclair-mr2
* changes:
  add dpad control of text selection for sholes
2009-10-20 15:09:51 -04:00
Dianne Hackborn
d2e65ef9f6 am 61462b43: Merge change I1864d098 into eclair
Merge commit '61462b437067a591bfc52c498ad964e566aaffac' into eclair-mr2

* commit '61462b437067a591bfc52c498ad964e566aaffac':
  Improve wallpaper offset handling.
2009-10-20 11:34:47 -07:00
Dianne Hackborn
32b1d91395 am 359f0b09: Merge change Ib5736616 into eclair
Merge commit '359f0b0998c26d2501346334d8850a2248920f0f' into eclair-mr2

* commit '359f0b0998c26d2501346334d8850a2248920f0f':
  Fix issue #2191572: Difficulties drawing window shade
2009-10-20 11:29:39 -07:00
Marco Nelissen
0ac608fb54 am cdc8b326: Merge change I61741f5a into eclair
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2

* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
  Fix high density bug 2179543: use 'dip' instead of 'px'
2009-10-20 11:29:26 -07:00
Android (Google) Code Review
82bd3ac45c Merge change I1864d098 into eclair
* changes:
  Improve wallpaper offset handling.
2009-10-20 14:27:55 -04:00
Android (Google) Code Review
1d4d11e4f3 Merge change Ib5736616 into eclair
* changes:
  Fix issue #2191572: Difficulties drawing window shade
2009-10-20 14:22:37 -04:00
Android (Google) Code Review
a532cc803d Merge change I61741f5a into eclair
* changes:
  Fix high density bug 2179543: use 'dip' instead of 'px'
2009-10-20 13:10:42 -04:00
Android (Google) Code Review
da6b116290 Merge change I58def690 into eclair-mr2
* changes:
  If openOrCreateDatabase() throws an exception, delete the old db and re-do it. If it still fails, something bad happens, like the directory may have the different permission. Let it throw as WebView needs the db.
2009-10-20 13:03:02 -04:00
Mike Lockwood
ce0f5937a0 am fa68ab4f: PowerManagerService: Add missing synchronization in mAutoBrightnessTask.
Merge commit 'fa68ab4fb0750b429c43af1d0c20539462ba6746' into eclair-mr2

* commit 'fa68ab4fb0750b429c43af1d0c20539462ba6746':
  PowerManagerService: Add missing synchronization in mAutoBrightnessTask.
2009-10-20 09:22:49 -07:00
Mike Lockwood
47d24b81b0 am 6c97fcab: Power Manager light sensor fixes:
Merge commit '6c97fcabbc4592a115afa5f3357b3172c4791855' into eclair-mr2

* commit '6c97fcabbc4592a115afa5f3357b3172c4791855':
  Power Manager light sensor fixes:
2009-10-20 09:22:37 -07:00
Mike Lockwood
a5bd406e6f am d7786b41: Power Manager support for light sensor backlight management.
Merge commit 'd7786b41b78ba8592daea708b024b5a75e441992' into eclair-mr2

* commit 'd7786b41b78ba8592daea708b024b5a75e441992':
  Power Manager support for light sensor backlight management.
2009-10-20 09:22:20 -07:00
jsh
aa94d00178 am cea8f8e4: Merge change I4219797a into eclair
Merge commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1' into eclair-mr2

* commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1':
  Log exception if we hit an error parsing an incoming SMS message.
2009-10-20 09:22:11 -07:00
Android (Google) Code Review
917faca354 Merge change Ibe55f880 into eclair-mr2
* changes:
  Bluetooth A2DP suspend-resume improvements.
2009-10-20 03:32:44 -04:00
Android (Google) Code Review
8e306feafa Merge change I4219797a into eclair
* changes:
  Log exception if we hit an error parsing an incoming SMS message.
2009-10-19 19:38:56 -04:00
Mathias Agopian
dcf9e8cf5d am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-mr2

* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
  Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
2009-10-19 16:27:37 -07:00
Mathias Agopian
673d2dbaae Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
this will be needed for SMP, but would improve dispatching GL calls a bit
on armv6 and above.
2009-10-19 16:13:46 -07:00
Mathias Agopian
feb0959742 am 62df88bc: Merge change I0953c1d5 into eclair
Merge commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b' into eclair-mr2

* commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b':
  fix [2153873] EGL-1.4 software implementation misses surface attributes
2009-10-19 15:33:59 -07:00
Amith Yamasani
9a55c0cdb8 am f37447ba: Proper fix for zero signal strength and no_service. Fixes #2176141
Merge commit 'f37447bad3773b62176baa837908daf6edb44273' into eclair-mr2

* commit 'f37447bad3773b62176baa837908daf6edb44273':
  Proper fix for zero signal strength and no_service. Fixes #2176141
2009-10-19 15:30:01 -07:00
Android (Google) Code Review
898300890d Merge change I0953c1d5 into eclair
* changes:
  fix [2153873] EGL-1.4 software implementation misses surface attributes
2009-10-19 18:27:47 -04:00
Dianne Hackborn
77a257f44f am b5d69242: am ae26b8b6: Update 5.xml with last minute changes.
Merge commit 'b5d69242d10021f82632d62c30b1ce63785c9386' into eclair-mr2

* commit 'b5d69242d10021f82632d62c30b1ce63785c9386':
  Update 5.xml with last minute changes.
2009-10-19 15:15:57 -07:00
Dianne Hackborn
89c515fa58 am ae26b8b6: Update 5.xml with last minute changes.
Merge commit 'ae26b8b6f40ad037927bf02ffd47953001c2cb3b' into eclair

* commit 'ae26b8b6f40ad037927bf02ffd47953001c2cb3b':
  Update 5.xml with last minute changes.
2009-10-19 15:04:14 -07:00
Mathias Agopian
0985f6a4ea fix [2153873] EGL-1.4 software implementation misses surface attributes 2009-10-19 14:46:27 -07:00
Mathias Agopian
edd3ac3a88 am 3662f9ee: Merge change Ide4c8cbc into eclair
Merge commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c' into eclair-mr2

* commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c':
  fix [2151588] glTexSubImage2D() allows pixel format conversion
2009-10-19 14:42:00 -07:00
Mathias Agopian
980a23abb4 am 639d69fe: Merge change I88d11cfb into eclair
Merge commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4' into eclair-mr2

* commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4':
  one step towards fixing [2071412] work around mdp 32-bits fade limitation
2009-10-19 14:41:48 -07:00
Android (Google) Code Review
e614aeaf32 Merge change Ide4c8cbc into eclair
* changes:
  fix [2151588] glTexSubImage2D() allows pixel format conversion
2009-10-19 17:31:52 -04:00
Android (Google) Code Review
5694da94a7 Merge change I88d11cfb into eclair
* changes:
  one step towards fixing [2071412] work around mdp 32-bits fade limitation
2009-10-19 17:31:35 -04:00
Mathias Agopian
d13e46158a fix [2151588] glTexSubImage2D() allows pixel format conversion 2009-10-19 14:23:02 -07:00
Android (Google) Code Review
c80b4ce911 Merge change I3834b1cb into eclair-mr2
* changes:
  support for multiline paragraph style indentation
2009-10-19 16:57:33 -04:00
Android (Google) Code Review
5add0f7289 Merge change I4458a55d into eclair-mr2
* changes:
  Add access to ContentProvider for SyncState.
2009-10-19 16:52:14 -04:00
Android (Google) Code Review
3af19ae9bf Merge change Ia245b1c4 into eclair-mr2
* changes:
  Add a string for upload file button.
2009-10-19 16:39:35 -04:00
Android (Google) Code Review
ff5a193a64 Merge change Ib1678609 into eclair-mr2
* changes:
  Avoid signaling a format change to the client if its insubstantial.
2009-10-19 16:15:30 -04:00
Dianne Hackborn
e67527165a am 007a429f: Update 5.xml with last minute changes.
Merge commit '007a429f09fb9e4e4fbd4205d03878874c9f7957' into eclair-mr2

* commit '007a429f09fb9e4e4fbd4205d03878874c9f7957':
  Update 5.xml with last minute changes.
2009-10-19 13:03:52 -07:00
Android (Google) Code Review
7fd3ef6a9e Merge change I63d524fd into eclair-mr2
* changes:
  Fixing the build by renaming private "string.h" header file.
2009-10-19 13:20:05 -04:00
Android (Google) Code Review
bdd4b61e2c Merge change I44bbc36d into eclair-mr2
* changes:
  Add htm and html extensions to the map as "text/html"
2009-10-17 12:20:42 -04:00
Mathias Agopian
6dbedd7519 one step towards fixing [2071412] work around mdp 32-bits fade limitation
simplify the GL_MODULATE case and allow blending disabled with RGBA texture
2009-10-16 18:24:12 -07:00
Scott Main
cf256a5354 am 445c05c4: am f3bc5349: docs: fix doc error in dialog example snippet (no not merge)
Merge commit '445c05c4849c960bb43f73a0390e62dc73991da6' into eclair-mr2

* commit '445c05c4849c960bb43f73a0390e62dc73991da6':
  docs: fix doc error in dialog example snippet (no not merge)
2009-10-16 18:03:08 -07:00
Scott Main
7846561bd6 am f3bc5349: docs: fix doc error in dialog example snippet (no not merge)
Merge commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f' into eclair

* commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f':
  docs: fix doc error in dialog example snippet (no not merge)
2009-10-16 17:52:15 -07:00
Andreas Huber
7a9b05fada resolved conflicts for merge of f585be7f to eclair-mr2 2009-10-16 15:32:50 -07:00
Yu Shan Emily Lau
bdcb5e6e4c am da2ecbeb: Merge change Idcaa1ef8 into eclair
Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-mr2

* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
  1) Add 10 seconds wait time before collecting the end memory.
2009-10-16 15:21:22 -07:00
Jason Sams
48bfd9c334 am d8f7a0e3: Merge change I7299c83b into eclair
Merge commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac' into eclair-mr2

* 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:17:25 -07:00
Android (Google) Code Review
8fe00cfcee Merge change I11ebbfd9 into eclair
* changes:
  A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
2009-10-16 18:13:19 -04:00
Android (Google) Code Review
997d737bbb Merge change Idcaa1ef8 into eclair
* changes:
  1) Add 10 seconds wait time before collecting the end memory. 2) Modified the player stress test, shorten the plabyack time.
2009-10-16 18:06:43 -04: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
537728fcd3 am 69fba87a: Merge change I6fc56997 into eclair
Merge commit '69fba87ac16d1c10da81fc3213ae169c755797f4' into eclair-mr2

* commit '69fba87ac16d1c10da81fc3213ae169c755797f4':
  fix [2187212] add support for GLESv2 dispatch based on TLS
2009-10-16 14:33:10 -07:00
Mathias Agopian
6751c84d4d am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-mr2

* commit '7bb7e99216956d917af1786a3e02a92cac46fc84':
  fix [2182249] [MR1] valgrind error in surface flinger
2009-10-16 14:33:01 -07:00