4211 Commits

Author SHA1 Message Date
Romain Guy
5cbbf0afde am 2437de94: am 32c687c2: Merge change 25351 into eclair
Merge commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e'

* commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e':
  Change Theme.Light's background back to pure white.
2009-09-17 12:11:23 -07:00
Leon Scroggins
ce20ffddfd am 3eb9a78a: am 4295613a: Merge change 25307 into eclair
Merge commit '3eb9a78a254395097cbb28e3826d25014422ead5'

* commit '3eb9a78a254395097cbb28e3826d25014422ead5':
  Allow touches to change the selection in WebTextView.
2009-09-17 12:11:14 -07:00
Evan Millar
1d42db5380 am 6c42a4ba: am 6a20b823: Merge change 25293 into eclair
Merge commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0'

* commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0':
  Fix a handful of bugs in the ContactHeaderWidget
2009-09-17 12:10:55 -07:00
Jean-Baptiste Queru
e910ef2258 am e525eef4: merge from open-source master
Merge commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b'

* commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b':
  Update comment in mediaplayer.h.
  Update documentation for getVideoWidth and getVideoHeight.
  Make Uri.parseUserPart, parseHost, and parsePort symmetric
  Javadoc used startApplication() which doesnt exists, changed to createApplication()
2009-09-17 12:10:47 -07:00
Karl Rosaen
ae32ac6e2e am 4babd458: am 82df16c6: Merge change 25297 into eclair
Merge commit '4babd458daa3fd7ff73110b1689094a9586a3c46'

* commit '4babd458daa3fd7ff73110b1689094a9586a3c46':
  Address romain's code review comments
2009-09-17 09:59:29 -07:00
Cary Clark
611be54a5c am 20158b9c: am c9e2e661: slide the title if the site changes the scroll position
Merge commit '20158b9ce5895fdbdedf5db103583264d94a62a4'

* commit '20158b9ce5895fdbdedf5db103583264d94a62a4':
  slide the title if the site changes the scroll position
2009-09-17 09:58:27 -07:00
Mike Lockwood
ca4bb53c76 am bdd1f2e3: am 9092ab4d: Add support for launching activities when attaching to a car or desk dock.
Merge commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b'

* commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b':
  Add support for launching activities when attaching to a car or desk dock.
2009-09-17 09:57:52 -07:00
Eric Fischer
165bc88555 am 5a7477ce: am 764916d0: Merge change 23383 into eclair
Merge commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18'

* commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18':
  Combine the "Permission Requested" title and subtitle into one string.
2009-09-17 09:57:40 -07:00
Cynthia Wong
9ff2e9392d am fc1a3657: am f5a5f045: Merge change 25296 into eclair
Merge commit 'fc1a365740478f61e671fe669fc466a9a753f031'

* commit 'fc1a365740478f61e671fe669fc466a9a753f031':
  Add new Gservices setting for discarding uphill ops for eclair and future devices.
2009-09-17 09:57:24 -07:00
Amith Yamasani
4fa32578c1 am 1272442f: am 0abc859e: Merge change 25299 into eclair
Merge commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2'

* commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2':
  Show keyboard automatically in EditTextPreference dialogs
2009-09-17 09:56:43 -07:00
Mike Lockwood
8d0e379884 am f324b2b0: am 4f8bb4c8: Merge change 25276 into eclair
Merge commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a'

* commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a':
  Use separate resources to control orientation change for car and desk docks.
2009-09-17 09:56:04 -07:00
Cary Clark
26b10afe9e am a78a1579: am 9f28d900: Merge change 25280 into eclair
Merge commit 'a78a157905ae49a170b0e2239df96b1f365f646d'

* commit 'a78a157905ae49a170b0e2239df96b1f365f646d':
  Don't scroll on load if titlebar is visible
2009-09-17 09:55:21 -07:00
Bjorn Bringert
db511f4cd8 am 5e3f452c: am 57384101: Merge change 25270 into eclair
Merge commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c'

* commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c':
  Use Resources to load search icons with android.resource URIs
2009-09-17 09:54:14 -07:00
Chih-Chung Chang
d127d2027f am 146a0fab: am 46ad7961: Unhide cancelAutoFocus API in Camera.
Merge commit '146a0fabb2db8d0677621d716ea02198c6a795ab'

* commit '146a0fabb2db8d0677621d716ea02198c6a795ab':
  Unhide cancelAutoFocus API in Camera.
2009-09-17 09:53:48 -07:00
Wu-cheng Li
70224719d8 am a326c816: am 7478ea68: Remove trailing spaces.
Merge commit 'a326c8160fa10c9954e9872f754309b1850d8ff4'

* commit 'a326c8160fa10c9954e9872f754309b1850d8ff4':
  Remove trailing spaces.
2009-09-17 09:53:00 -07:00
Jeff Sharkey
a4d37d85bf am 46f11652: am 85628188: Merge change 25244 into eclair
Merge commit '46f116520fe7ec04e99dd37d805fc852a71bf795'

* commit '46f116520fe7ec04e99dd37d805fc852a71bf795':
  Flag indicating if Contacts source has any unsynced groups.
2009-09-17 09:51:57 -07:00
Dianne Hackborn
31612db5f5 am 10bedaaf: am 7fc39b26: Merge change 25238 into eclair
Merge commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d'

* commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d':
  Implement issue #1780928: Need support hiding nav keys.
2009-09-17 09:51:33 -07:00
Jeff Sharkey
c3474ed7cb am 454e3c84: am 9352b9fb: Merge change 25232 into eclair
Merge commit '454e3c848feee705df79ea02feca5c9b97bfc5de'

* commit '454e3c848feee705df79ea02feca5c9b97bfc5de':
  Fix NPE when provider returns null cursor.
2009-09-17 09:51:01 -07:00
Daisuke Miyakawa
e39646b836 am 055714dd: am 6cf05f1c: Merge change 25206 into eclair
Merge commit '055714ddbb0db6634e362b357f5e11a77444c6de'

* commit '055714ddbb0db6634e362b357f5e11a77444c6de':
  Make vCard importer code use Account information if possible.
2009-09-17 09:49:55 -07:00
Karl Rosaen
802f7e4e02 am 20dfa6ab: am c6587dc8: Merge change 25178 into eclair
Merge commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00'

* commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00':
  Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
2009-09-17 09:49:20 -07:00
Dianne Hackborn
3a3defb98a am c5624813: am 6ee7b04d: Merge change 25192 into eclair
Merge commit 'c562481380a4f5ddffc67dd72d81e2ded5bd201f'

* commit 'c562481380a4f5ddffc67dd72d81e2ded5bd201f':
  Some improvements for wallpaper configuration.
2009-09-17 09:48:54 -07:00
Derek Sollenberger
2f114591d7 am 4b3cb661: am 5862b673: Merge change 25187 into eclair
Merge commit '4b3cb66144134a5fa289a6cfed65add0ff13d43b'

* commit '4b3cb66144134a5fa289a6cfed65add0ff13d43b':
  fixing documentation for PluginStub
2009-09-17 09:48:17 -07:00
Jim Miller
725967dffc am f2b0fb8c: am 7c3e493d: Merge change 25177 into eclair
Merge commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3'

* commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3':
  Fix for #2092883: Allow manual sync even when background data is disabled
2009-09-17 09:47:47 -07:00
Nick Pelly
1b8ccd64cc am e10bbc50: am e74050a9: Merge change 25175 into eclair
Merge commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca'

* commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca':
  Allow only System Service to send most Bluetooth intents.
2009-09-17 09:47:31 -07:00
Derek Sollenberger
e67777ed3d am 21da3357: am 64ce0f8f: Merge change 24200 into eclair
Merge commit '21da33570278762d7e9375b83eb74130bf82728d'

* commit '21da33570278762d7e9375b83eb74130bf82728d':
  First pass at replacing native plugin views with java.
2009-09-17 09:46:15 -07:00
Romain Guy
2437de94ed am 32c687c2: Merge change 25351 into eclair
Merge commit '32c687c20d6ac3080b396787147892dc85126b33' into eclair-plus-aosp

* commit '32c687c20d6ac3080b396787147892dc85126b33':
  Change Theme.Light's background back to pure white.
2009-09-17 08:39:53 -07:00
Leon Scroggins
3eb9a78a25 am 4295613a: Merge change 25307 into eclair
Merge commit '4295613a0ea1f61398d3123746740ca27d9ea170' into eclair-plus-aosp

* commit '4295613a0ea1f61398d3123746740ca27d9ea170':
  Allow touches to change the selection in WebTextView.
2009-09-17 08:39:45 -07:00
Evan Millar
6c42a4bad6 am 6a20b823: Merge change 25293 into eclair
Merge commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60' into eclair-plus-aosp

* commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60':
  Fix a handful of bugs in the ContactHeaderWidget
2009-09-17 08:39:27 -07:00
Eric Fischer
9a67623ef5 am dda648f0: am b6a7ea54: Merge change 25153 into eclair
Merge commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a'

* commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a':
  Reconcile the character popups for the hard and soft keyboards.
2009-09-17 06:44:02 -07:00
Dmitri Plotnikov
ee5ebad62e am bfb4992f: am 90142c95: Adding a system property to log slow queries
Merge commit 'bfb4992f190b1f93e70d2102f35f8df019406758'

* commit 'bfb4992f190b1f93e70d2102f35f8df019406758':
  Adding a system property to log slow queries
2009-09-17 06:42:52 -07:00
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
Bjorn Bringert
85434dfb74 am d8681c9a: am 88cd369c: Merge change 25048 into eclair
Merge commit 'd8681c9a93abb1a56eae9548d568bb9ae38419a1'

* commit 'd8681c9a93abb1a56eae9548d568bb9ae38419a1':
  Revert "Deprecate showSearchIconAsBadge and icon search attrs"
2009-09-17 06:39:17 -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