Commit Graph

4909 Commits

Author SHA1 Message Date
Dirk Dougherty
0de17f44ef am f5a760f1: am 4be629f2: Update sizes/checksums for SDK packages.
Merge commit 'f5a760f17527b91c864336ea10b52322d0667ec5' into eclair-plus-aosp

* commit 'f5a760f17527b91c864336ea10b52322d0667ec5':
  Update sizes/checksums for SDK packages.
2009-09-15 13:56:36 -07:00
Scott Main
72dbb646a3 am 2eeb1f0e: am ca75d7f5: docs only. superficial typo
Merge commit '2eeb1f0ed0ca9648e3a3b9120f945edd0b1a4a81' into eclair-plus-aosp

* commit '2eeb1f0ed0ca9648e3a3b9120f945edd0b1a4a81':
  docs only.
2009-09-15 13:56:29 -07:00
Cary Clark
b1725bb026 am 7ad6dc27: Merge change 25110 into eclair
Merge commit '7ad6dc27176a0d3f5374d7d3b9bffda492296237' into eclair-plus-aosp

* commit '7ad6dc27176a0d3f5374d7d3b9bffda492296237':
  synchronize access to pictureReady, copyContentPicture
2009-09-15 13:51:26 -07:00
jsh
d74d357725 am d631fedb: Merge change 25109 into eclair
Merge commit 'd631fedb6cec492812afc5082461afcbfa4ae07f' into eclair-plus-aosp

* commit 'd631fedb6cec492812afc5082461afcbfa4ae07f':
  Some SMS logging improvements.
2009-09-15 13:51:19 -07:00
Jean-Michel Trivi
650e05e4c1 am 91a5d831: am b5308a70: Merge change 24816 into donut
Merge commit '91a5d831d6e2311d4129cb6086a67ab66874992c' into eclair-plus-aosp

* commit '91a5d831d6e2311d4129cb6086a67ab66874992c':
  TextToSpeech javadoc update.
2009-09-15 13:47:13 -07:00
Scott Main
04979c36f2 am bc663a65: am 528954c4: docs only. fix sample code errors per bug 2115299
Merge commit 'bc663a65315e6eab9d92316072250ea9efc9f18a' into eclair-plus-aosp

* commit 'bc663a65315e6eab9d92316072250ea9efc9f18a':
  docs only.
2009-09-15 13:47:06 -07:00
Dirk Dougherty
17556395d6 am 4be629f2: Update sizes/checksums for SDK packages.
Merge commit '4be629f2548483c37483904f1c9121e8fc248640' into eclair

* commit '4be629f2548483c37483904f1c9121e8fc248640':
  Update sizes/checksums for SDK packages.
2009-09-15 13:47:02 -07:00
Mike Reed
0ed20cc4ee am df4cf297: redraw once more on a touch-up if we\'ve been dragging, so we can redraw in high-quality mode update dox on BlurMaskFilter
Merge commit 'df4cf29715146d67306595108c565d9848a6ae1a' into eclair-plus-aosp

* commit 'df4cf29715146d67306595108c565d9848a6ae1a':
  redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
2009-09-15 13:46:59 -07:00
Scott Main
72489b3fb6 am ca75d7f5: docs only. superficial typo
Merge commit 'ca75d7f59aa4bfdc124397ce2b61942c80b3350a' into eclair

* commit 'ca75d7f59aa4bfdc124397ce2b61942c80b3350a':
  docs only.
2009-09-15 13:46:54 -07:00
Evan Millar
fe23624cda am e727f18c: Add the FasttrackBadgeWidget.
Merge commit 'e727f18cf2649d07a89aba19ecefed93c9d0b305' into eclair-plus-aosp

* commit 'e727f18cf2649d07a89aba19ecefed93c9d0b305':
  Add the FasttrackBadgeWidget.
2009-09-15 13:46:53 -07:00
Mike Lockwood
b977d8081f am 6d9eebe7: Merge change 25090 into eclair
Merge commit '6d9eebe7320637f0256c077ba5ed6724b5a4ab0d' into eclair-plus-aosp

* commit '6d9eebe7320637f0256c077ba5ed6724b5a4ab0d':
  Move backlight brightness from HardwareService to PowerManager
2009-09-15 13:46:43 -07:00
Jason Sams
41f1459426 am ffa18dfa: Merge change 25100 into eclair
Merge commit 'ffa18dfac0b5e9e665897c9b1c107cb4268006b2' into eclair-plus-aosp

* commit 'ffa18dfac0b5e9e665897c9b1c107cb4268006b2':
  Implement Object readback.
2009-09-15 13:46:32 -07:00
Fred Quintana
88878a2085 am 0ae011b6: Merge change 24990 into eclair
Merge commit '0ae011b6f6d709d840f60f25df2046c9545a10a2' into eclair-plus-aosp

* commit '0ae011b6f6d709d840f60f25df2046c9545a10a2':
  change to use the new CALLER_IS_SYNCADAPTER flag
2009-09-15 13:46:21 -07:00
Bjorn Bringert
98443918f7 am 88cd369c: Merge change 25048 into eclair
Merge commit '88cd369c33ed2fe194e889b05559eb172e4896ac' into eclair-plus-aosp

* commit '88cd369c33ed2fe194e889b05559eb172e4896ac':
  Revert "Deprecate showSearchIconAsBadge and icon search attrs"
2009-09-15 13:45:49 -07:00
Android (Google) Code Review
c55e65e724 Merge change 25110 into eclair
* changes:
  synchronize access to pictureReady, copyContentPicture
2009-09-15 16:38:15 -04:00
Android (Google) Code Review
c4df531927 Merge change 25109 into eclair
* changes:
  Some SMS logging improvements.
2009-09-15 16:37:36 -04:00
Jean-Michel Trivi
88c226c3b2 am b5308a70: Merge change 24816 into donut
Merge commit 'b5308a7051fedacf289470c8a7e21b63af9d4db8' into eclair

* commit 'b5308a7051fedacf289470c8a7e21b63af9d4db8':
  TextToSpeech javadoc update.
2009-09-15 13:18:46 -07:00
Scott Main
0dadd607ff am 528954c4: docs only. fix sample code errors per bug 2115299
Merge commit '528954c4d63980c0515528624130477f921cbc60' into eclair

* commit '528954c4d63980c0515528624130477f921cbc60':
  docs only.
2009-09-15 13:18:34 -07:00
Android (Google) Code Review
c33bd9d541 Merge change 25090 into eclair
* changes:
  Move backlight brightness from HardwareService to PowerManager
2009-09-15 15:50:51 -04:00
Android (Google) Code Review
e0960fc781 Merge change 25100 into eclair
* changes:
  Implement Object readback.
2009-09-15 15:40:09 -04:00
Android (Google) Code Review
66fc12f0ad Merge change 24990 into eclair
* changes:
  change to use the new CALLER_IS_SYNCADAPTER flag
2009-09-15 15:26:42 -04:00
Ken Schultz
af38dc7183 am 74a0b820: Merge change 25089 into eclair
Merge commit '74a0b8209e0228bb48739a4b25e489e2eba2a2c4' into eclair-plus-aosp

* commit '74a0b8209e0228bb48739a4b25e489e2eba2a2c4':
  DockObserver wakes the display when broadcasting a change
2009-09-15 11:53:39 -07:00
Dianne Hackborn
45f1212348 am 1cd403ea: Add SurfaceView API to put surface on top of window.
Merge commit '1cd403eaac24e0e84619dea07e2d1d60e58e1fd2' into eclair-plus-aosp

* commit '1cd403eaac24e0e84619dea07e2d1d60e58e1fd2':
  Add SurfaceView API to put surface on top of window.
2009-09-15 11:53:32 -07:00
Android (Google) Code Review
ab99e30ffb Merge change 25048 into eclair
* changes:
  Revert "Deprecate showSearchIconAsBadge and icon search attrs"
2009-09-15 14:51:56 -04:00
Android (Google) Code Review
891edaa44e Merge change 25089 into eclair
* changes:
  DockObserver wakes the display when broadcasting a change 	- normal display timeout applies after wake
2009-09-15 14:44:34 -04:00
Brett Chabot
8eabc1c233 am d583a015: Merge change 25078 into eclair
Merge commit 'd583a015bcbac8718cbf5ed8a1c40d074c65a226' into eclair-plus-aosp

* commit 'd583a015bcbac8718cbf5ed8a1c40d074c65a226':
  Fix FileObserverTest#testRun.
2009-09-15 11:26:12 -07:00
Android (Google) Code Review
dfca93871a Merge change 25078 into eclair
* changes:
  Fix FileObserverTest#testRun.
2009-09-15 14:18:57 -04:00
Christian Gustafsson
a05b6f66d2 am 70f74b79: Assemble WAP datagram correctly when segments arrive out of order
Merge commit '70f74b79c3e4c88e0e7b747796f76187e4ea8259' into eclair-plus-aosp

* commit '70f74b79c3e4c88e0e7b747796f76187e4ea8259':
  Assemble WAP datagram correctly when segments arrive out of order
2009-09-15 11:05:23 -07:00
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