Commit Graph

3216 Commits

Author SHA1 Message Date
Romain Guy
ff016b2856 am ac025929: am 7bd66001: Merge change 25117 into eclair
Merge commit 'ac02592986ef5c0d6f8a4f01627c0caa69d7b047'

* commit 'ac02592986ef5c0d6f8a4f01627c0caa69d7b047':
  Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
2009-09-17 06:41:10 -07:00
Cary Clark
167d7e2c61 am a94341f7: am 7ad6dc27: Merge change 25110 into eclair
Merge commit 'a94341f7c777679d6d37d3402315ca73f24bccc1'

* commit 'a94341f7c777679d6d37d3402315ca73f24bccc1':
  synchronize access to pictureReady, copyContentPicture
2009-09-17 06:40:29 -07:00
Jean-Michel Trivi
6949f42ed6 am 3e8c0ee8: am 91a5d831: am b5308a70: Merge change 24816 into donut
Merge commit '3e8c0ee84223328f3e8e5b430aa719969cd4f38d'

* commit '3e8c0ee84223328f3e8e5b430aa719969cd4f38d':
  TextToSpeech javadoc update.
2009-09-17 06:40:13 -07:00
Mike Reed
dcf4382813 am a451c625: 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 'a451c6255962116516c3b4df92fd72084a881e0e'

* commit 'a451c6255962116516c3b4df92fd72084a881e0e':
  redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
2009-09-17 06:39:58 -07:00
Evan Millar
c339e8562d am efeaf0cc: am e727f18c: Add the FasttrackBadgeWidget.
Merge commit 'efeaf0cc3d288a38cd0c647855024453fde0488c'

* commit 'efeaf0cc3d288a38cd0c647855024453fde0488c':
  Add the FasttrackBadgeWidget.
2009-09-17 06:39:50 -07:00
Mike Lockwood
64a92c638b am 744dfae2: am 6d9eebe7: Merge change 25090 into eclair
Merge commit '744dfae2e95cc3e6f4bf5ca1fea3d202e9f89bd7'

* commit '744dfae2e95cc3e6f4bf5ca1fea3d202e9f89bd7':
  Move backlight brightness from HardwareService to PowerManager
2009-09-17 06:39:42 -07:00
Fred Quintana
57112f985e am cc5c8a42: am 0ae011b6: Merge change 24990 into eclair
Merge commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5'

* commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5':
  change to use the new CALLER_IS_SYNCADAPTER flag
2009-09-17 06:39:26 -07:00
Dianne Hackborn
7966bfe691 am a90d14f2: am 1cd403ea: Add SurfaceView API to put surface on top of window.
Merge commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c'

* commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c':
  Add SurfaceView API to put surface on top of window.
2009-09-17 06:37:36 -07:00
Grace Kloba
cde38b4bc4 am 6aab672a: am 04b2868c: WebView zoom clean up
Merge commit '6aab672a177ef2196c3900c2dc19fdfdb0143cac'

* commit '6aab672a177ef2196c3900c2dc19fdfdb0143cac':
  WebView zoom clean up
2009-09-17 06:36:48 -07:00
Cary Clark
f76892386f am 6cd80d73: am db6d939d: if the cursor and focus don\'t match, match them on text view clicks
Merge commit '6cd80d738969e9398f763691bde4e240bff48074'

* commit '6cd80d738969e9398f763691bde4e240bff48074':
  if the cursor and focus don't match, match them on text view clicks
2009-09-17 06:36:34 -07:00
Cary Clark
ac9fbcb652 am c6a35f8e: am df344375: compute Y scroll max by scaling only, ignoring title bar height
Merge commit 'c6a35f8e3f6823f095259ee5ffd595d123c0cc1b'

* commit 'c6a35f8e3f6823f095259ee5ffd595d123c0cc1b':
  compute Y scroll max by scaling only, ignoring title bar height
2009-09-17 06:36:27 -07:00
Mike Reed
37b72ccd48 am 1f42641e: am 5adeba4b: Merge change 25059 into eclair
Merge commit '1f42641ebf775d0438f2694876067e547a40527a'

* commit '1f42641ebf775d0438f2694876067e547a40527a':
  special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to
2009-09-17 06:36:19 -07:00
Nick Pelly
3810daf778 am 60fb7075: am 82dbf678: Merge change 24998 into eclair
Merge commit '60fb7075eeb5adeccf698ad72f1b83e2321b384a'

* commit '60fb7075eeb5adeccf698ad72f1b83e2321b384a':
  Add Panasonic KX-TH112 to blacklist.
2009-09-17 05:27:41 -07:00
Dan Murphy
d245a45fdc am fce5c3d6: am 4e3cdf85: Merge change 23619 into eclair
Merge commit 'fce5c3d6eefef9ab4d563721c39704842ce96bf4'

* commit 'fce5c3d6eefef9ab4d563721c39704842ce96bf4':
  Add automatic lighting control framework
2009-09-16 23:57:49 -07:00
Chih-Chung Chang
ae5e468f65 am e8f77e69: am 244f8c26: Fix 2083478: Camera needs an auto-focus cancel API
Merge commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762'

* commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762':
  Fix 2083478: Camera needs an auto-focus cancel API
2009-09-16 23:57:30 -07:00
Dianne Hackborn
174fc3cea0 am 1c3d36ec: am 678b4c20: Merge change 25013 into eclair
Merge commit '1c3d36ec6c3ed111e43d41e59d0ac1e740972dc1'

* commit '1c3d36ec6c3ed111e43d41e59d0ac1e740972dc1':
  Various fixed for back key handling.
2009-09-16 23:57:14 -07:00
Daniel Sandler
1e9354c584 am cb805e5c: am bd443c01: Merge change 24887 into eclair
Merge commit 'cb805e5caf551ba641633a364ef9b1a188bfce27'

* commit 'cb805e5caf551ba641633a364ef9b1a188bfce27':
  Fix http://b/issue?id=2098873 (drawing glitch in SeekBar).
2009-09-16 23:56:58 -07:00
Dianne Hackborn
38c105c359 am a4160068: am 294cd985: Merge change 24850 into eclair
Merge commit 'a4160068beadf64db99f42ca327bfe263cc46a85'

* commit 'a4160068beadf64db99f42ca327bfe263cc46a85':
  Last big work on #1991910: Make swipes work with capacitive keys
2009-09-16 23:56:47 -07:00
Dianne Hackborn
a246941d53 am 23b141ef: am c2974809: Fix issue #2116977: buttons are huge and bent
Merge commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59'

* commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59':
  Fix issue #2116977: buttons are huge and bent
2009-09-16 23:56:23 -07:00
Debajit Ghosh
7671f55dfe am 426ec7f3: am e7f47f50: Merge change 24921 into eclair
Merge commit '426ec7f30679c813350c18bdae125fce5b1c7725'

* commit '426ec7f30679c813350c18bdae125fce5b1c7725':
  add system properties for experimenting with sync timeouts.
2009-09-16 23:56:15 -07:00
Leon Scroggins
7bd25a02f5 am dc0ec6d6: am 74077c8f: Clear the password field when reloading the current page.
Merge commit 'dc0ec6d6da1a330a292d49ab97a47f9218222f9b'

* commit 'dc0ec6d6da1a330a292d49ab97a47f9218222f9b':
  Clear the password field when reloading the current page.
2009-09-16 23:56:07 -07:00
Dianne Hackborn
d16ce30c31 am 7c32e4bc: am d023f9a9: Merge change 24829 into eclair
Merge commit '7c32e4bc300bb75203f65ca55b08ecd3156fa2bb'

* commit '7c32e4bc300bb75203f65ca55b08ecd3156fa2bb':
  Some optizations to wallpaper drawing/scrolling.
2009-09-16 23:55:33 -07:00
Romain Guy
100c2c3c7c am ae7e8a76: am 944808f3: Merge change 24927 into eclair
Merge commit 'ae7e8a760d7ce3ab1ec6f965cc0164e8be3eeba8'

* commit 'ae7e8a760d7ce3ab1ec6f965cc0164e8be3eeba8':
  Fix a possible NPE in View.
2009-09-16 23:55:10 -07:00
Jaikumar Ganesh
654864c1de am 61c15090: am 482d54bb: Add black listing of car kits by name.
Merge commit '61c150903cd56df26f9bf1c411ff20713d09a779'

* commit '61c150903cd56df26f9bf1c411ff20713d09a779':
  Add black listing of car kits by name.
2009-09-16 23:55:02 -07:00
Jim Miller
581593d630 am 7df4c83a: am df5e76f9: Merge change 24814 into eclair
Merge commit '7df4c83a95a3517532b3de4fdc2c07270609e67e'

* commit '7df4c83a95a3517532b3de4fdc2c07270609e67e':
  Enable log message for tracking issue #2092299.
2009-09-16 23:54:50 -07:00
Leon Scroggins
e328cb5fe6 am 9fc38f40: am d247aadf: Bring up the soft keyboard when touching a focused textfield.
Merge commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa'

* commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa':
  Bring up the soft keyboard when touching a focused textfield.
2009-09-16 23:54:42 -07:00
Grace Kloba
459ea40408 am d5a2813b: am dd817492: Remove trackball double click. Treat each click as a single click.
Merge commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01'

* commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01':
  Remove trackball double click. Treat each click as a single click.
2009-09-16 23:54:33 -07:00
Cary Clark
5cfb9fc19a am 3ff3e3fc: am 298d32e1: Set the minimum fling to the title height.
Merge commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8'

* commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8':
  Set the minimum fling to the title height.
2009-09-16 23:54:18 -07:00
Eric Fischer
f62173ac7e am 76d82371: am 13bc4ad1: Merge change 24902 into eclair
Merge commit '76d82371a90e81f2d5214d7b16ba713cb73771d1'

* commit '76d82371a90e81f2d5214d7b16ba713cb73771d1':
  Add "rtsp" to the list of URL schemes that get linkified.
2009-09-16 18:02:43 -07:00
Grace Kloba
a79a5b99a7 am 920d01f8: am b6e164c7: Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the httpauth table.
Merge commit '920d01f80a34c4b9098f79433b14091caea6a38a'

* commit '920d01f80a34c4b9098f79433b14091caea6a38a':
  Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the
2009-09-16 18:02:19 -07:00
Grace Kloba
90cc6b9d1b am d161e3f2: am 0fdae4cc: Merge change 24747 into eclair
Merge commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989'

* commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989':
  Use floor to calculate the range to avoid the rounding error triggered
2009-09-16 18:01:24 -07:00
Bjorn Bringert
f4d1f8de1c am c16f6f33: am 6cb1330d: Merge change 24683 into eclair
Merge commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda'

* commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda':
  Tell GlobalSearch about searches without a suggestion
2009-09-16 18:00:59 -07:00
Bob Lee
dfefa7f355 am e0100f47: am 93f00def: Merge change 24509 into eclair
Merge commit 'e0100f4736b987af22a719f740c3c25793b0a95e'

* commit 'e0100f4736b987af22a719f740c3c25793b0a95e':
  Addressed reviewer comments.
2009-09-16 10:51:32 -07:00
Ye Wen
b41e0ee61c am a4726088: am 9a0bf14c: Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority from "im" to "com.google.android.providers.talk"; also change the mime types.
Merge commit 'a47260887917546fc867b8998fa3ba77639d64a4'

* commit 'a47260887917546fc867b8998fa3ba77639d64a4':
  Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
2009-09-16 10:50:28 -07:00
Romain Guy
ac02592986 am 7bd66001: Merge change 25117 into eclair
Merge commit '7bd660012ca5d946f4f4efb9d357a785e6a4d4eb' into eclair-plus-aosp

* commit '7bd660012ca5d946f4f4efb9d357a785e6a4d4eb':
  Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
2009-09-15 14:16:21 -07:00
Android (Google) Code Review
7bd660012c Merge change 25117 into eclair
* changes:
  Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
2009-09-15 16:57:53 -04:00
Romain Guy
3616a412cb Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
Change-Id: Id5ac804a4053951430d16cf0d87fc7b64c816717
2009-09-15 13:57:27 -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
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
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
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
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
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
Jack Wang
a28ed57090 am 65e301c0: am e441dcbb: Merge change 22561 into eclair
Merge commit '65e301c09bf88a0a390b0a5924b2844804b9ce5b'

* commit '65e301c09bf88a0a390b0a5924b2844804b9ce5b':
  Performance measurement framework:
2009-09-15 13:21:03 -07:00
Christopher Tate
553ebbf53f am 3c731875: am 38eeac30: Merge change 24797 into eclair
Merge commit '3c7318756617c346162e511aff71b889879495d8'

* commit '3c7318756617c346162e511aff71b889879495d8':
  Don't backup/restore telephony material from secure settings
2009-09-15 13:20:14 -07:00
Costin Manolache
c126c4b49c am d42da368: am d3e061fc: Merge change 24609 into eclair
Merge commit 'd42da36810b392867341b07d5bf1f2c47fa71c86'

* commit 'd42da36810b392867341b07d5bf1f2c47fa71c86':
  If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the  event again.
2009-09-15 13:19:02 -07: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
Romain Guy
68bd8cf7fe am b04c6689: am 02ee5387: Merge change 24764 into eclair
Merge commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad'

* commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad':
  Add @Widget annotation to GestureOverlayView to make it usable in ADT.
2009-09-15 13:17:55 -07:00
Jaikumar Ganesh
01c0a12985 am e08e60a7: am 32d8571f: Changes for BT 2.1
Merge commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0'

* commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0':
  Changes for BT 2.1
2009-09-15 13:17:45 -07:00