Andreas Huber
4c7fba719a
am e2c32e9f: If nothing is to be copied, return right away.
...
* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
If nothing is to be copied, return right away.
2011-03-21 16:21:29 -07:00
Teng-Hui Zhu
8960381aa9
am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
...
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
Support loading image and paused image for inline video
2011-03-21 14:19:29 -07:00
Teng-Hui Zhu
0953e89934
Merge "Support loading image and paused image for inline video" into honeycomb-mr1
2011-03-21 14:01:10 -07:00
Justin Ho
a50dad82b5
am 5e35c485: Updated 3G and wifi traffic indicators
...
* commit '5e35c4855a972960403a10811882ebded8945006':
Updated 3G and wifi traffic indicators
2011-03-21 10:54:51 -07:00
Mike Lockwood
ba33281a5f
am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
...
* commit 'dd76dc0297f4c39fefbbc1ac23d9b1add187d9e9':
UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:25:09 -07:00
Mike Lockwood
731d1353d3
Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
2011-03-20 17:08:24 -07:00
Jamie Gennis
560fe009e5
am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
...
* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
SurfaceFlinger: Fix a typo.
2011-03-18 17:34:27 -07:00
Jamie Gennis
d32a694a0c
Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
2011-03-18 17:32:25 -07:00
Jamie Gennis
5fd799dab6
SurfaceFlinger: Fix a typo.
...
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.
Bug: 3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
2011-03-18 16:35:13 -07:00
Russell Brenner
bd7b09f841
am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491 " into honeycomb-mr1
...
* commit 'a0dc8da2ab0a084432c7094e434b7957dd2eaf5c':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
2011-03-18 15:32:18 -07:00
Russell Brenner
b36926abde
Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491 " into honeycomb-mr1
2011-03-18 15:28:27 -07:00
Teng-Hui Zhu
3b9b781405
am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit '7eaf483140f1c42f29c7cde71061521280b253ce':
Asset for video poster
2011-03-18 15:22:03 -07:00
Teng-Hui Zhu
c53cb0d36c
Merge "Asset for video poster" into honeycomb-mr1
2011-03-18 15:19:28 -07:00
Daisuke Miyakawa
bf4b3f73ce
am b02d3956: am e16a1bfa: Use system locale list.
...
* commit 'b02d395650a9a5fb13812cefa0ada1501f5b6d62':
Use system locale list.
2011-03-18 11:27:22 -07:00
Daisuke Miyakawa
48a27defe9
am e16a1bfa: Use system locale list.
...
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
Use system locale list.
2011-03-18 11:23:00 -07:00
Derek Sollenberger
529f878975
am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
...
* commit '5750bb7d8f59c0f8e18baaa60bcb492c867db590':
Prevent intermediate scale updates from being sent to WebKit while zooming.
2011-03-18 11:02:45 -07:00
shailendra
e6fb416547
am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
...
* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:02:35 -07:00
Derek Sollenberger
800094d7d1
Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
2011-03-18 10:57:46 -07:00
shailendra
886c92028f
Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
2011-03-18 09:35:37 -07:00
Dianne Hackborn
1828fd2a08
am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit '1d50ad7914de36b63a04d39bdc4791c1dadc7eae':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:02:15 -07:00
Dianne Hackborn
acf8cb2596
Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
2011-03-17 19:00:56 -07:00
Huahui Wu
1b3437371d
am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
...
* commit 'b1c43c32f518240fd75963ffc8e82cb13e036390':
b/4116658 Fix the jumpy scrolling with some flash site.
2011-03-17 18:11:04 -07:00
Huahui Wu
f6fb4ed1dc
Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
2011-03-17 18:09:33 -07:00
Wink Saville
c57bb62954
am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1
...
* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
Change stopship to todo.
2011-03-17 18:00:55 -07:00
Wink Saville
b77b4807d0
Merge "Change stopship to todo." into honeycomb-mr1
2011-03-17 17:58:06 -07:00
Justin Ho
8ca8908e0f
am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
...
* commit '5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
2011-03-17 17:55:58 -07:00
James Dong
0db849a855
am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
...
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
Fix missing AOSP copyright headers for more files
2011-03-17 17:55:48 -07:00
Justin Ho
c14e692d62
Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
2011-03-17 16:49:32 -07:00
James Dong
29c6574d45
Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
2011-03-17 16:11:13 -07:00
James Dong
5f7204cb66
Fix missing AOSP copyright headers for more files
...
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp
because these two files were moved from other places to the current location,
and were actually created in 2010.
bug - 4119349
Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
2011-03-17 14:43:12 -07:00
Teng-Hui Zhu
3e8fac41f4
am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
...
* commit '73091273bb5160567f2230e1e7fcde5b0218ad9d':
Fix the aspect ratio for full screen playing
2011-03-17 14:22:26 -07:00
Teng-Hui Zhu
691935bfcd
Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
2011-03-17 14:20:39 -07:00
Xavier Ducrohet
0eb5f29a5d
am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1
...
* commit '026d6be2dcc425f83d9d7ec8740068147497b305':
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
2011-03-17 14:15:38 -07:00
Xavier Ducrohet
fdebf54854
Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1
2011-03-17 14:12:49 -07:00
Eric Fischer
9fe43705c7
am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'e6ef8d0b75494e8d1e8f619b2a461c11fe8fb965':
Import revised translations. DO NOT MERGE
2011-03-17 13:32:58 -07:00
Eric Fischer
d4c0f4ec71
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-17 13:29:47 -07:00
James Dong
892c399bdc
am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files
...
* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
Fix missing AOSP copyright headers for a bunch of media framework files
2011-03-17 11:56:05 -07:00
Gloria Wang
95a8679095
am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
...
* commit 'def35f7a47cde8bf66d4cba4570b289e0e9d625a':
Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
2011-03-17 10:54:00 -07:00
Gloria Wang
3e99aa92cb
Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
2011-03-17 10:49:43 -07:00
Paul Milovanov
7c4c1cc17a
am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
...
* commit '87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee':
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
2011-03-17 10:26:32 -07:00
Paul Milovanov
c7112b9ef8
Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
2011-03-17 10:23:48 -07:00
Mike Lockwood
ba47878adf
am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
...
* commit '11473332b4df78610ebb903e255d69ab35e5bf59':
MtpServer: Do not attempt to stop MTP if it has not been started
2011-03-17 07:26:44 -07:00
Mike Lockwood
973c0ad411
Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
2011-03-17 07:24:12 -07:00
Daniel Sandler
9abaf18427
am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1
...
* commit '8f5cab8b31014a261f4e6e12e6d751de51de37c3':
Remove logspew.
2011-03-17 06:31:56 -07:00
Daniel Sandler
7d96e2657e
Merge "Remove logspew." into honeycomb-mr1
2011-03-17 06:23:45 -07:00
Adam Powell
84391e64c8
am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
...
* commit 'f8d1533b07b51935e295b2cf92e2ea2aa94b303f':
Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
2011-03-17 01:38:15 -07:00
Adam Powell
c985885653
Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
2011-03-17 01:36:47 -07:00
Jeff Brown
cd00ac8d55
am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
...
* commit 'd98f8aff731123eef1f0a8bc8bfc917647d5ac3a':
Fix dangling pointer when device closed just after opening.
2011-03-17 01:00:36 -07:00
Jeff Brown
8fb4327df3
Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
2011-03-17 00:59:08 -07:00
Mathias Agopian
9260be0e79
am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
...
* commit 'f40e638ec62cd9e1a1851809b7c8bf5e4187fad2':
fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
2011-03-17 00:10:10 -07:00