Commit Graph

5244 Commits

Author SHA1 Message Date
Andreas Huber
fe040ade1f am b0e6a9a0: Merge change I7a03b074 into eclair
Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2

* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
  Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
2009-10-22 10:46:50 -07:00
Android (Google) Code Review
be8bac24dc Merge change Ie31311fd into eclair-mr2
* changes:
  fix the "right icon" in the titlebar
2009-10-22 13:30:44 -04:00
Leon Scroggins
3d56076f91 am f8e3ac85: Merge change Ifa8ab30e into eclair
Merge commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b' into eclair-mr2

* commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b':
  In onKeyUp for DPAD_CENTER, show the IME for text input.
2009-10-22 06:47:47 -07:00
Eric Fischer
b6747deddd am 2cb6b7fb: (-s ours) Merge change Ic4bf942c into eclair
Merge commit '2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-mr2

* commit '2cb6b7fb868899a3c718280605b0e462d0f8491f':
  Import revised translations.  DO NOT MERGE
2009-10-22 06:47:24 -07:00
Jack Palevich
7cd5d8c2f9 am 785768a9: Merge change Id443ba45 into eclair
Merge commit '785768a9216b3a631237587feffea2aeb05a91cc' into eclair-mr2

* commit '785768a9216b3a631237587feffea2aeb05a91cc':
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-22 06:44:52 -07:00
Brett Chabot
db45e05fff am 6270d52c: (-s ours) Merge change Ica1d7b90 into eclair
Merge commit '6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-mr2

* commit '6270d52c0dded8658733a392f3ef1f521bc5dbee':
  Disable known failure math tanhd tests  (DO NOT MERGE)
2009-10-22 06:43:22 -07:00
Jeff Sharkey
716600cf34 am 9aa7e4e7: am d7bc6546: Fix spacing to escape "false" correctly.
Merge commit '9aa7e4e729b6f3c3075e762af37c259f84bfe876' into eclair-mr2

* commit '9aa7e4e729b6f3c3075e762af37c259f84bfe876':
  Fix spacing to escape "false" correctly.
2009-10-22 06:42:34 -07:00
Dianne Hackborn
c58e395bb6 am 8d9ddbe2: Merge change I1f30f3f1 into eclair
Merge commit '8d9ddbe2aa3db86237880102ccf320945e7f57d3' into eclair-mr2

* commit '8d9ddbe2aa3db86237880102ccf320945e7f57d3':
  Fix #2201615: getCallingPackage returns calling process instead of calling package
2009-10-22 06:38:50 -07:00
Suchi Amalapurapu
a8f0f3e2ff am 5b48223d: Merge change I14e833fa into eclair
Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2

* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
  If we fail to persist the current settings and fall back to the back settings file
2009-10-22 06:38:33 -07:00
Doug Zongker
07840e5394 am 617262d8: (-s ours) Merge change I37c4157d into eclair
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2

* commit '617262d8f57362536ddc00a070c1c0994741de44':
  add "junk path" -k option to aapt (DO NOT MERGE)
2009-10-21 22:22:27 -07:00
Andreas Huber
b88458bf90 am ca404dfb: (-s ours) Merge change Ie3ffb526 into eclair
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-mr2

* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
  do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
2009-10-21 22:21:52 -07:00
Brett Chabot
e5b28caf27 am 76bb9a36: Merge change I1932e8f8 into eclair
Merge commit '76bb9a363633b5741937ebe58b01a8b2024753b0' into eclair-mr2

* commit '76bb9a363633b5741937ebe58b01a8b2024753b0':
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
2009-10-21 22:21:40 -07:00
Android (Google) Code Review
89e6154f8b Merge change I66ff8af6 into eclair-mr2
* changes:
  Move calc of EriIconIndex/Mode to whenever basis changes
2009-10-21 20:45:37 -04:00
Android (Google) Code Review
d13596a331 Merge change Ie2d155a5 into eclair-mr2
* changes:
  Add a new API for initing Wifi multicast filtering
2009-10-21 19:44:30 -04:00
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
0d2ad405e5 Merge change I7a03b074 into eclair
* changes:
  Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
2009-10-21 18:15:20 -04:00
Android (Google) Code Review
d304153d35 Merge change Ifa8ab30e into eclair
* changes:
  In onKeyUp for DPAD_CENTER, show the IME for text input.
2009-10-21 16:11:23 -04:00
Android (Google) Code Review
381d519aad Merge change Ic4bf942c into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-10-21 15:09:58 -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
c0151f27ad Merge change Id443ba45 into eclair
* changes:
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-21 14:04:26 -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
47bd9427f9 Merge change Ica1d7b90 into eclair
* changes:
  Disable known failure math tanhd tests  (DO NOT MERGE)
2009-10-21 00:48:41 -04:00
Jeff Sharkey
3b43a2139d am d7bc6546: Fix spacing to escape "false" correctly.
Merge commit 'd7bc6546268ccc21954427a3ef56f6365bacef5a' into eclair

* commit 'd7bc6546268ccc21954427a3ef56f6365bacef5a':
  Fix spacing to escape "false" correctly.
2009-10-20 16:20:36 -07:00
Android (Google) Code Review
2364ae3160 Merge change I1f30f3f1 into eclair
* changes:
  Fix #2201615: getCallingPackage returns calling process instead of calling package
2009-10-20 19:14:20 -04:00
Android (Google) Code Review
068fc95640 Merge change I14e833fa into eclair
* changes:
  If we fail to persist the current settings and fall back to the back settings file when reading settings in PackageManager, we might rename the corrupted settings to backup(in case of power failure between the earlier write failure and file deletion) and end up loosing both files. So just clear up the corrupted current settings file if we have backup. The backup wouldn't exist if everything went well with persisting the earlier settings.
2009-10-20 18:51:06 -04:00
Android (Google) Code Review
7793548d0a Merge change I37c4157d into eclair
* changes:
  add "junk path" -k option to aapt (DO NOT MERGE)
2009-10-20 16:28:05 -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
cbc92d7b91 Merge change Ie3ffb526 into eclair
* changes:
  do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
2009-10-20 15:52:29 -04:00
Android (Google) Code Review
3d5b3c099f Merge change I1932e8f8 into eclair
* changes:
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
2009-10-20 15:13:05 -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