Commit Graph

4878 Commits

Author SHA1 Message Date
Android (Google) Code Review
98a84d09cb Merge change 25153 into eclair
* changes:
  Reconcile the character popups for the hard and soft keyboards.
2009-09-15 19:43:00 -04:00
Android (Google) Code Review
ca963ab9dd Merge change 25162 into eclair
* changes:
  Build the BitmapShader if it hasn't been built yet.
2009-09-15 19:40:58 -04:00
Libin Tang
aaf6373ad8 am d1d67782: Merge change 25147 into eclair
Merge commit 'd1d6778247d4b3798f9b9fafca4312a348826a0b' into eclair-plus-aosp

* commit 'd1d6778247d4b3798f9b9fafca4312a348826a0b':
  Fix call collision issue
2009-09-15 16:24:09 -07:00
Andreas Huber
d3f69b094a am 781a5dd5: Merge change 25142 into eclair
Merge commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715' into eclair-plus-aosp

* commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715':
  The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
2009-09-15 16:19:35 -07:00
Android (Google) Code Review
8ea7c779c3 Merge change 25147 into eclair
* changes:
  Fix call collision issue
2009-09-15 19:17:14 -04:00
Android (Google) Code Review
8e60fc0f40 Merge change 25142 into eclair
* changes:
  The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
2009-09-15 19:11:17 -04:00
Dmitri Plotnikov
968b9b074d am 90142c95: Adding a system property to log slow queries
Merge commit '90142c959e6de38eae1563cd8b3d2d448393e15f' into eclair-plus-aosp

* commit '90142c959e6de38eae1563cd8b3d2d448393e15f':
  Adding a system property to log slow queries
2009-09-15 16:03:59 -07:00
Andreas Huber
9943758704 am a4fe2aca: Merge change 25128 into eclair
Merge commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379' into eclair-plus-aosp

* commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379':
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
2009-09-15 14:51:30 -07:00
Andreas Huber
881f8c01e9 am 0edada08: Merge change 25101 into eclair
Merge commit '0edada085e175e81b6d38a48b5b022917b410a98' into eclair-plus-aosp

* commit '0edada085e175e81b6d38a48b5b022917b410a98':
  Added an API IOMX::createRendererFromJavaSurface.
2009-09-15 14:51:23 -07:00
Fred Quintana
7425f83be7 am 4b687f2e: Merge change 25132 into eclair
Merge commit '4b687f2eb5461da1d86189d19bfaaf669e24cd90' into eclair-plus-aosp

* commit '4b687f2eb5461da1d86189d19bfaaf669e24cd90':
  fix ContentProviderOperationTest
2009-09-15 14:51:16 -07:00
Android (Google) Code Review
1a3f52c9ac Merge change 25128 into eclair
* changes:
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
2009-09-15 17:48:33 -04:00
Android (Google) Code Review
aa503d787a Merge change 25101 into eclair
* changes:
  Added an API IOMX::createRendererFromJavaSurface.
2009-09-15 17:48:22 -04:00
Android (Google) Code Review
c063c00905 Merge change 25132 into eclair
* changes:
  fix ContentProviderOperationTest
2009-09-15 17:42:25 -04:00
Guang Zhu
515b1706c2 am 617d470d: Merge change 25124 into eclair
Merge commit '617d470dffdc0b5fa24454b0e07438ad0f4721f9' into eclair-plus-aosp

* commit '617d470dffdc0b5fa24454b0e07438ad0f4721f9':
  Add more error message if the script failed to pull result file from device.
2009-09-15 14:25:49 -07:00
Android (Google) Code Review
91c05074c1 Merge change 25124 into eclair
* changes:
  Add more error message if the script failed to pull result file from device.
2009-09-15 17:18:02 -04:00
Yu Shan Emily Lau
917fafaa8e am 4d445d68: Merge change 24955 into eclair
Merge commit '4d445d682e6380b26fbe5cd06cb0ca4c532739e7' into eclair-plus-aosp

* commit '4d445d682e6380b26fbe5cd06cb0ca4c532739e7':
  new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
2009-09-15 14:16:27 -07:00
Romain Guy
ced0602179 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
7e807d85c3 Merge change 24955 into eclair
* changes:
  	new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java 	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.
2009-09-15 17:10:54 -04:00
Android (Google) Code Review
f63b7ac2c4 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
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