8133 Commits

Author SHA1 Message Date
Scott Main
51b33f5da1 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
a94341f7c7 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
a338367a92 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
3e8c0ee842 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
942c02a6c1 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
Mike Reed
a451c62559 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
2eeb1f0ed0 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
efeaf0cc3d 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
744dfae2e9 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
b33eb79b94 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
cc5c8a42fc 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
d8681c9a93 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
7ad6dc2717 Merge change 25110 into eclair
* changes:
  synchronize access to pictureReady, copyContentPicture
2009-09-15 16:38:15 -04:00
Android (Google) Code Review
d631fedb6c Merge change 25109 into eclair
* changes:
  Some SMS logging improvements.
2009-09-15 16:37:36 -04:00
Cary Clark
674a844f6d synchronize access to pictureReady, copyContentPicture
Two methods in WebViewCore are called from WebView. The C
underpinnings were synchronized with a mutex, but the Java
shell was not, so under rare cirumstances, the Java side might
delete the native class. Add Java synchronization to
protect against this.

Fixes http://b/issue?id=2121684
2009-09-15 16:29:50 -04:00
Jean-Michel Trivi
91a5d831d6 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
bc663a6531 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
Mike Reed
df4cf29715 redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
update dox on BlurMaskFilter
2009-09-15 16:16:05 -04:00
jsh
50f7ea53c3 Some SMS logging improvements.
Use Log.isLoggable() to enable logs at runtime.  Implement SmsResponse.toString()
so we can see what's returned.

Hopefully helps with debugging b/2086832.
2009-09-15 13:11:25 -07:00
Evan Millar
e727f18cf2 Add the FasttrackBadgeWidget.
This widget is an extension of ImageView that takes care of the standard
fasttrack badging and on-click behavior. It should be used in any
applications that display contact photos.

This view's name will have to be changed before release, and will be
kept private until the name change is made. At that point the view will
be made public api.

Change-Id: I4704e0e979466929ad7b2ef11911681a5028b4a7
2009-09-15 13:00:49 -07:00
Android (Google) Code Review
6d9eebe732 Merge change 25090 into eclair
* changes:
  Move backlight brightness from HardwareService to PowerManager
2009-09-15 15:50:51 -04:00
Mike Lockwood
237a29923a Move backlight brightness from HardwareService to PowerManager
to prevent apps from changing the hardware behind its back.
Fixes b/2041941 Lock screen flashes the screen very bright before dimming

Change-Id: Ice757f7ae87902bdfb3634471cf44f020ebfaae4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-15 15:47:09 -04:00
Android (Google) Code Review
ffa18dfac0 Merge change 25100 into eclair
* changes:
  Implement Object readback.
2009-09-15 15:40:09 -04:00
Jason Sams
5f43fd289a Implement Object readback. 2009-09-15 12:39:22 -07:00
Android (Google) Code Review
0ae011b6f6 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
dd4819f377 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
a90d14f2dd 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
88cd369c33 Merge change 25048 into eclair
* changes:
  Revert "Deprecate showSearchIconAsBadge and icon search attrs"
2009-09-15 14:51:56 -04:00
Bjorn Bringert
ed2c13a9d2 Revert "Deprecate showSearchIconAsBadge and icon search attrs"
I tried to revert a flag, but that doesn't actually work
and ended up deprecating the entire attribute.

This reverts commit ab50b86b79936623b5e326f2ed84b3c947c8ec93.
2009-09-15 19:49:10 +01:00
Android (Google) Code Review
74a0b8209e 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
Dianne Hackborn
1cd403eaac Add SurfaceView API to put surface on top of window.
Change-Id: I9db84ee63a362e54ebc2f5b24a20ae5bdc3588bf
2009-09-15 11:29:00 -07:00
Brett Chabot
230a75ecda 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
d583a015bc Merge change 25078 into eclair
* changes:
  Fix FileObserverTest#testRun.
2009-09-15 14:18:57 -04:00
Brett Chabot
0393d349be Fix FileObserverTest#testRun.
The assertion in the test was expecting 4 events, but it was only waiting for
three.

BUG 2119135
2009-09-15 11:07:33 -07:00
Christian Gustafsson
fca752b9d8 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
6aab672a17 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
Christian Gustafsson
70f74b79c3 Assemble WAP datagram correctly when segments arrive out of order
The WAP assembly code will always attach the last received segment at the end
of the WAP datagram. Change the code to add the current segment at the correct
location during the WAP datagram assembly.

Change-Id: I4cc18bf33bc68ab9a328a0107f21e3670b5026ac
2009-09-15 10:57:15 -07:00
Grace Kloba
04b2868c74 WebView zoom clean up 2009-09-15 10:53:44 -07:00
Cary Clark
6cd80d7389 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
c6a35f8e3f 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
1f42641ebf 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
Cary Clark
db6d939d2b if the cursor and focus don't match, match them on text view clicks
Call nativeMotionUp from touchUpOnTextField to move the
mouse cursor to the text field if necessary before moving
the text caret to the desired position.

Fixes http://b/issue?id=2075647
2009-09-15 13:24:33 -04:00
Cary Clark
df344375a9 compute Y scroll max by scaling only, ignoring title bar height
without this, the max scroll may be a single pixel
2009-09-15 13:24:32 -04:00
Android (Google) Code Review
5adeba4b7f 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
Mike Reed
e9e86b8908 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:14:20 -04:00
Tao Liejun
f4c60bb273 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
Tao Liejun
e80534ff59 Fix connection ID issue in Obex lib
ConnectionID should be consistent in one Obex session.
2009-09-15 09:54:20 -07:00
Nick Pelly
60fb7075ee 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
ae4df42005 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
82dbf67851 Merge change 24998 into eclair
* changes:
  Add Panasonic KX-TH112 to blacklist.
2009-09-15 11:29:52 -04:00