Commit Graph

4931 Commits

Author SHA1 Message Date
Grace Kloba
9ea2da5abb am 04b2868c: WebView zoom clean up
Merge commit '04b2868c74a54cf711552262f0ad20d234b627b4' into eclair-plus-aosp

* commit '04b2868c74a54cf711552262f0ad20d234b627b4':
  WebView zoom clean up
2009-09-15 11:00:40 -07:00
Cary Clark
762eae7413 am db6d939d: if the cursor and focus don\'t match, match them on text view clicks
Merge commit 'db6d939d2bbf457b1caa5479a60dae5e90d023e1' into eclair-plus-aosp

* commit 'db6d939d2bbf457b1caa5479a60dae5e90d023e1':
  if the cursor and focus don't match, match them on text view clicks
2009-09-15 10:40:54 -07:00
Cary Clark
51aeebc6a7 am df344375: compute Y scroll max by scaling only, ignoring title bar height
Merge commit 'df344375a93f3bfe0360f5436c0866f44b7fb6cc' into eclair-plus-aosp

* commit 'df344375a93f3bfe0360f5436c0866f44b7fb6cc':
  compute Y scroll max by scaling only, ignoring title bar height
2009-09-15 10:40:49 -07:00
Mike Reed
3793d57de3 am 5adeba4b: Merge change 25059 into eclair
Merge commit '5adeba4b7f63081257f9d0fb65127bdce0399c79' into eclair-plus-aosp

* commit '5adeba4b7f63081257f9d0fb65127bdce0399c79':
  special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to
2009-09-15 10:26:07 -07:00
Android (Google) Code Review
2ee0d98f9a Merge change 25059 into eclair
* changes:
  special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to round "out" these, to account for the slop in antialiasing, rather than using the existing routines that (correctly) round.
2009-09-15 13:19:56 -04:00
Tao Liejun
6a79461d65 am e80534ff: Fix connection ID issue in Obex lib
Merge commit 'e80534ff59b2e62a0ddf4359147b81f5ba10de86' into eclair-plus-aosp

* commit 'e80534ff59b2e62a0ddf4359147b81f5ba10de86':
  Fix connection ID issue in Obex lib
2009-09-15 10:12:01 -07:00
Nick Pelly
0da1c2a844 am 82dbf678: Merge change 24998 into eclair
Merge commit '82dbf6785184a9a0808210294365e32ff21add9c' into eclair-plus-aosp

* commit '82dbf6785184a9a0808210294365e32ff21add9c':
  Add Panasonic KX-TH112 to blacklist.
2009-09-15 08:35:11 -07:00
Eric Laurent
df1e208d2c am 2bccbcc7: Merge change 25050 into eclair
Merge commit '2bccbcc777ca48a08663c16e90ea3f76ace6eb07' into eclair-plus-aosp

* commit '2bccbcc777ca48a08663c16e90ea3f76ace6eb07':
  Fix issue 2118464: cannot play ring tones and notifications after disconnecting BT headset while in call.
2009-09-15 08:35:04 -07:00
Android (Google) Code Review
d3e7a6341c Merge change 24998 into eclair
* changes:
  Add Panasonic KX-TH112 to blacklist.
2009-09-15 11:29:52 -04:00
Android (Google) Code Review
e5b0c94708 Merge change 25050 into eclair
* changes:
  Fix issue 2118464: cannot play ring tones and notifications after disconnecting BT headset while in call.
2009-09-15 11:29:23 -04:00
Jean-Baptiste Queru
8991536d42 merge from open-source master 2009-09-15 07:52:09 -07:00
Mike Lockwood
9504a57baa am f73f91c5: Merge change 25012 into eclair
Merge commit 'f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f' into eclair-plus-aosp

* commit 'f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f':
  PowerManagerService: Use 5 cm threshold for the proximity sensor.
2009-09-15 07:38:56 -07:00
Dan Murphy
8284f4496c am 4e3cdf85: Merge change 23619 into eclair
Merge commit '4e3cdf854441b84c15fd9f127127b6d116834c51' into eclair-plus-aosp

* commit '4e3cdf854441b84c15fd9f127127b6d116834c51':
  Add automatic lighting control framework
2009-09-15 07:38:50 -07:00
Android (Google) Code Review
e587271895 Merge change 25012 into eclair
* changes:
  PowerManagerService: Use 5 cm threshold for the proximity sensor.
2009-09-15 10:32:13 -04:00
Android (Google) Code Review
c7f1c4c191 Merge change 23619 into eclair
* changes:
  Add automatic lighting control framework
2009-09-15 10:29:26 -04:00
Chih-Chung Chang
7e7afdff3b am 244f8c26: Fix 2083478: Camera needs an auto-focus cancel API
Merge commit '244f8c26365a303d9dd861bd48a29a4b48578da1' into eclair-plus-aosp

* commit '244f8c26365a303d9dd861bd48a29a4b48578da1':
  Fix 2083478: Camera needs an auto-focus cancel API
2009-09-15 07:19:58 -07:00
Eric Laurent
b3687ae925 Fix issue 2118464: cannot play ring tones and notifications after disconnecting BT headset while in call.
The problem comes from the fact that when the duplicated output is closed after BT headset disconnection, the OUTPUT_CLOSED notification is not sent to AudioSystem. Then the mapping between notification stream and duplicated output cached in AudioSystem is not cleared and next time a notification is played, the duplicated output is selected and the createTrack() request is refused by AudioFlinger as the selected output doesn't exist.
The notification is ignored by AudioFlinger because when it is sent by the terminating playback thread, the thread has already been removed from the playback thread list.

The fix consists in sending the notification in closeOutput() and not when exiting the playback thread.
The same fix is applied to record threads.
2009-09-15 07:10:12 -07:00
Chih-Chung Chang
00900eb354 Fix 2083478: Camera needs an auto-focus cancel API
Change-Id: I13bda991b32aee47e82b5cf9d43b3021c416a9a2
2009-09-15 18:29:03 +08:00
Eric Laurent
3829ab35c0 am 54c06152: Merge change 24872 into eclair
Merge commit '54c06152e0d9c666aec61ae5d9686d7d3327ea34' into eclair-plus-aosp

* commit '54c06152e0d9c666aec61ae5d9686d7d3327ea34':
  Fix issue 2115450: a2dp thread is started, even though we are only connected to headset and not playing music.
2009-09-14 23:33:23 -07:00
Android (Google) Code Review
f5733b2938 Merge change 24872 into eclair
* changes:
  Fix issue 2115450: a2dp thread is started, even though we are only connected to headset and not playing music.
2009-09-15 02:26:19 -04:00
Dianne Hackborn
b100cf8e48 am 678b4c20: Merge change 25013 into eclair
Merge commit '678b4c20cb92ac2b86f13e52ea86d70301358680' into eclair-plus-aosp

* commit '678b4c20cb92ac2b86f13e52ea86d70301358680':
  Various fixed for back key handling.
2009-09-14 21:30:52 -07:00
Android (Google) Code Review
acfb3cf865 Merge change 25013 into eclair
* changes:
  Various fixed for back key handling.
2009-09-15 00:26:45 -04:00
Mathias Agopian
fccc67cb05 am 151921a6: Merge change 24977 into eclair
Merge commit '151921a62485f2141ad1316076c196ef00e1b421' into eclair-plus-aosp

* commit '151921a62485f2141ad1316076c196ef00e1b421':
  add support for RGBX_8888 surfaces in SurfaceFlinger
2009-09-14 18:21:10 -07:00
Daniel Sandler
3f49574d5b am bd443c01: Merge change 24887 into eclair
Merge commit 'bd443c01a0fadb2d536ffce1c45950f9037cbc56' into eclair-plus-aosp

* commit 'bd443c01a0fadb2d536ffce1c45950f9037cbc56':
  Fix http://b/issue?id=2098873 (drawing glitch in SeekBar).
2009-09-14 18:14:58 -07:00
Dianne Hackborn
0ccce711ba am 294cd985: Merge change 24850 into eclair
Merge commit '294cd9856e30daa07efbdd7d925b3fad8cb123de' into eclair-plus-aosp

* commit '294cd9856e30daa07efbdd7d925b3fad8cb123de':
  Last big work on #1991910: Make swipes work with capacitive keys
2009-09-14 18:14:51 -07:00
Android (Google) Code Review
b44070812a Merge change 24977 into eclair
* changes:
  add support for RGBX_8888 surfaces in SurfaceFlinger
2009-09-14 21:11:56 -04:00
Mathias Agopian
816d7d0268 add support for RGBX_8888 surfaces in SurfaceFlinger 2009-09-14 18:10:30 -07:00
Android (Google) Code Review
0cb56ea4a0 Merge change 24887 into eclair
* changes:
  Fix http://b/issue?id=2098873 (drawing glitch in SeekBar).
2009-09-14 21:07:00 -04:00
Android (Google) Code Review
14c6452ac4 Merge change 24850 into eclair
* changes:
  Last big work on #1991910: Make swipes work with capacitive keys
2009-09-14 20:56:46 -04:00
jsh
6c64fb49e9 am 53793416: Merge change 24662 into eclair
Merge commit '53793416d408366270d21f81734997db348bd918' into eclair-plus-aosp

* commit '53793416d408366270d21f81734997db348bd918':
  Fix URI returned by IccProvider.
2009-09-14 17:48:06 -07:00
Jason Sams
7131c2141f am 4503cb75: Merge change 24968 into eclair
Merge commit '4503cb75a02f6465bd576366945a1c5f2c8c13f3' into eclair-plus-aosp

* commit '4503cb75a02f6465bd576366945a1c5f2c8c13f3':
  Minor perf tweak for fountain.
2009-09-14 17:48:00 -07:00
Android (Google) Code Review
7bad1e2052 Merge change 24662 into eclair
* changes:
  Fix URI returned by IccProvider.
2009-09-14 20:30:43 -04:00
Android (Google) Code Review
7abf9adcca Merge change 24968 into eclair
* changes:
  Minor perf tweak for fountain.
2009-09-14 20:15:31 -04:00
Dianne Hackborn
150372c64b am c2974809: Fix issue #2116977: buttons are huge and bent
Merge commit 'c2974809373697147cbe5754835cc871fb93aef1' into eclair-plus-aosp

* commit 'c2974809373697147cbe5754835cc871fb93aef1':
  Fix issue #2116977: buttons are huge and bent
2009-09-14 17:09:28 -07:00
Debajit Ghosh
a6fca1442a am e7f47f50: Merge change 24921 into eclair
Merge commit 'e7f47f50ad0a97e32c87104e56f311db910e98f1' into eclair-plus-aosp

* commit 'e7f47f50ad0a97e32c87104e56f311db910e98f1':
  add system properties for experimenting with sync timeouts.
2009-09-14 16:34:39 -07:00
Leon Scroggins
7a7195b77b am 74077c8f: Clear the password field when reloading the current page.
Merge commit '74077c8f2ed67b79be67df853158932fbd774865' into eclair-plus-aosp

* commit '74077c8f2ed67b79be67df853158932fbd774865':
  Clear the password field when reloading the current page.
2009-09-14 16:34:33 -07:00
Android (Google) Code Review
7ae8a14b7d Merge change 24921 into eclair
* changes:
  add system properties for experimenting with sync timeouts.
2009-09-14 19:30:37 -04:00
Mathias Agopian
d42c5dae84 am b06aac86: Merge change 24948 into eclair
Merge commit 'b06aac86d1be8cd018f2568d64f50d61c421d1f0' into eclair-plus-aosp

* commit 'b06aac86d1be8cd018f2568d64f50d61c421d1f0':
  fix [2117464] SF can crash when calling dumpsys
2009-09-14 16:09:10 -07:00
Mathias Agopian
20d8874206 am a1212578: Merge change 24947 into eclair
Merge commit 'a1212578bfd11bd391c686c82c18b21b4a3a69b4' into eclair-plus-aosp

* commit 'a1212578bfd11bd391c686c82c18b21b4a3a69b4':
  make sure to update the tail pointer when undoing a dequeue
2009-09-14 16:09:04 -07:00
Android (Google) Code Review
7dcffed3f5 Merge change 24948 into eclair
* changes:
  fix [2117464] SF can crash when calling dumpsys
2009-09-14 19:02:19 -04:00
Android (Google) Code Review
ab0fb1be89 Merge change 24947 into eclair
* changes:
  make sure to update the tail pointer when undoing a dequeue
2009-09-14 19:01:40 -04:00
Mathias Agopian
4790a3c1a2 fix [2117464] SF can crash when calling dumpsys 2009-09-14 15:59:16 -07:00
Andreas Huber
8f79c7dd51 am 0d558113: Merge change 24932 into eclair
Merge commit '0d5581133285cef4d7582b531e0bf09cee86aa90' into eclair-plus-aosp

* commit '0d5581133285cef4d7582b531e0bf09cee86aa90':
  Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
2009-09-14 15:54:15 -07:00
Dianne Hackborn
867af8a231 am d023f9a9: Merge change 24829 into eclair
Merge commit 'd023f9a9a90705410250cd86bc6446c738423a99' into eclair-plus-aosp

* commit 'd023f9a9a90705410250cd86bc6446c738423a99':
  Some optizations to wallpaper drawing/scrolling.
2009-09-14 15:54:08 -07:00
Android (Google) Code Review
abff9f77d5 Merge change 24932 into eclair
* changes:
  Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
2009-09-14 18:48:58 -04:00
Mathias Agopian
c7d5601081 make sure to update the tail pointer when undoing a dequeue 2009-09-14 15:48:42 -07:00
Android (Google) Code Review
94b4a1cbcf Merge change 24829 into eclair
* changes:
  Some optizations to wallpaper drawing/scrolling.
2009-09-14 18:45:42 -04:00
San Mehat
5d21e3ab36 am aa931bcb: Merge change 24841 into eclair
Merge commit 'aa931bcb0acb93ce760f4e5d27153fb1c6d33a10' into eclair-plus-aosp

* commit 'aa931bcb0acb93ce760f4e5d27153fb1c6d33a10':
  process: Switch to common cutils sched_policy api
2009-09-14 15:38:43 -07:00
Android (Google) Code Review
25c118e7e1 Merge change 24841 into eclair
* changes:
  process: Switch to common cutils sched_policy api
2009-09-14 18:31:39 -04:00
Guang Zhu
bcddb01031 am 55bfddad: Merge change 24931 into eclair
Merge commit '55bfddad197f1a82d94152ee82bb110d8a9f32d9' into eclair-plus-aosp

* commit '55bfddad197f1a82d94152ee82bb110d8a9f32d9':
  Fix the bogus crashes in layout and reliability tests (the device actually went offline).
2009-09-14 15:29:24 -07:00