Steve Block
dcbb82a24e
Merge "Update the error for WebView thread violations to make clear that it's not fatal"
2011-09-26 08:41:09 -07:00
Andreas Huber
c42d1f4d0b
Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
2011-09-26 08:09:11 -07:00
Ben Murdoch
1f6293c35f
Merge "Force a WebView pictureset invalidation on screen rotation."
2011-09-26 06:19:56 -07:00
Brian Colonna
03d75aa97c
Merge "FaceLock is now closed if emergency dial button is pressed"
2011-09-26 06:03:02 -07:00
Roman Nurik
a7a78dd480
Merge "Update supported media formats doc for ICS"
2011-09-26 00:16:40 -07:00
Jeff Sharkey
2778b511f6
Merge "Watch network subtype, tethering teardown, empty."
2011-09-25 23:44:10 -07:00
Adam Powell
2a527aefe9
Merge "Fix bug 5358705 - Request no full-screen mode of the IME when a SearchView is expanded in an action bar"
2011-09-25 14:45:59 -07:00
Bart Sears
7c152d0742
Merge "Revert "Transfer large bitmaps using ashmem. Bug: 5224703""
2011-09-25 14:32:14 -07:00
Bart Sears
8acda78034
Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
...
This reverts commit 56c58f66b97d22fe7e7de1f7d9548bcbe1973029
This CL was causing the browser to crash when adding bookmarks, visiting the bookmarks page, and sharing pages (see bug http://b/issue?id=5369231
2011-09-25 14:30:21 -07:00
Jeff Brown
b94d5065d2
Merge "Transfer large bitmaps using ashmem. Bug: 5224703"
2011-09-24 20:49:20 -07:00
Brandon Keely
51d016345a
Merge "Avoid double-ping when tapping outside the handle."
2011-09-24 15:16:54 -07:00
Jeff Brown
f4c1088d75
Transfer large bitmaps using ashmem.
...
Bug: 5224703
Change-Id: Ic7481dd9f173986f085a8bbdcc59bbe9830d7a44
2011-09-23 21:20:47 -07:00
Jeff Brown
5cecad7dc9
Merge "Prevent unintended rotations. Bug: 4981385"
2011-09-23 18:28:01 -07:00
Adam Powell
5dbf2640fa
Merge "Fix bug 5355889 - Search action showing up in the menu dropdown in spite of search actionview being expanded"
2011-09-23 18:16:22 -07:00
Russell Brenner
688b44de66
am a6ccaa73: Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
...
* commit 'a6ccaa736d18d1ee375162e9df9d2aad8db869e5':
Replaced Lohit_Hindi with Lohit-Devanagari
2011-09-23 17:40:31 -07:00
Russell Brenner
848b09071f
Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
2011-09-23 17:38:10 -07:00
Eric Fischer
72fa2193ec
am b8c78262: Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
...
* commit 'b8c7826264816492ff91a27b1eb2d0d1454053e1':
Mark MCC locale replacement strings not translatable.
2011-09-23 15:46:56 -07:00
Eric Fischer
673a6445f8
Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
2011-09-23 15:45:27 -07:00
Eric Fischer
ed0bb9bea2
am 90bf4765: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit '90bf47658855c2ab0d85933d2fc7925ec3de6bf4':
Import revised translations. DO NOT MERGE
2011-09-23 15:39:51 -07:00
Eric Fischer
250e4f6dc3
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-23 15:37:46 -07:00
Irfan Sheriff
85f1af8f1a
am c21994bc: Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom
...
* commit 'c21994bc26df959d1a7161e38b4402b7255ea321':
Fix watchdog to stop ping after wifi disconnects
2011-09-23 15:20:56 -07:00
Irfan Sheriff
ceac65ebc8
Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom
2011-09-23 15:18:37 -07:00
Fabrice Di Meglio
e0db82163c
Merge "Fix bug #5349461 TextView: text that ends with an ImageSpan causes line height to shrink to ImageSpan height"
2011-09-23 15:18:37 -07:00
Brian Colonna
d4a9a7adf0
Merge "Changed result of entering credentials after forgot pattern"
2011-09-23 15:09:15 -07:00
Adam Powell
b972130da6
Merge "Fix bug 5341139 - bottom bar stays if app wants to handle orientation change"
2011-09-23 15:06:30 -07:00
Dianne Hackborn
beaf6908be
Merge "Fix issue #5173952 : Opening a Notification From Lock Screen..."
2011-09-23 14:54:26 -07:00
John Reck
dc2b90a8fe
Merge "Add detail to restorePicture deprecation"
2011-09-23 14:48:52 -07:00
Eric Laurent
2ba740ee7b
Merge "Fix issue 5355047: Automated effect tests fail."
2011-09-23 14:43:12 -07:00
Fabrice Di Meglio
18545e60d3
Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"
2011-09-23 13:30:41 -07:00
Svetoslav Ganov
54a5ca150c
Merge "Scroll accessibility events should not populate text."
2011-09-23 13:26:18 -07:00
Amith Yamasani
945abfc3f3
Merge "Launch nested preferences with the same theme as parent activity."
2011-09-23 13:24:38 -07:00
Christopher Tate
d6fd1e3322
am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom
...
* commit 'b20d378cec09da18301eb9c33bc88251beb81042':
Don't crash during full backup when CheckJNI is enabled
2011-09-23 13:21:07 -07:00
Christopher Tate
367dedc53e
Merge "Don't crash during full backup when CheckJNI is enabled" into ics-factoryrom
2011-09-23 13:19:33 -07:00
Scott Main
a33317e9e2
Merge "docs: a few additions and revisions to action bar docs"
2011-09-23 13:13:13 -07:00
Dianne Hackborn
0f8f963ae4
Merge "Fix issue #5321282 : Force Stop Button in Battery Screen Not disabled correctly"
2011-09-23 12:56:42 -07:00
Kenny Root
b322b2daa9
Merge "Less verbose message when dexopt non-APK"
2011-09-23 12:49:44 -07:00
Adam Powell
17aaed081f
Merge "Remove unnecessary parameter"
2011-09-23 12:45:13 -07:00
Andreas Huber
f47f011681
Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool."
2011-09-23 11:27:51 -07:00
David Brown
e597b355bf
Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers."
2011-09-23 11:25:57 -07:00
Adam Powell
4e10649083
Merge "Fix leaky view tags"
2011-09-23 11:05:25 -07:00
Wei Huang
29ba087776
am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
...
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
Update camera javadoc about AE and AWB lock.
2011-09-23 10:05:22 -07:00
Wei Huang
929e551f6c
Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
2011-09-23 10:04:02 -07:00
Eric Fischer
ade6d8ae78
am c4517842: Merge "Delete translations of files that no longer exist." into ics-factoryrom
...
* commit 'c4517842ee2a641342f151ecafb797080b9ed84d':
Delete translations of files that no longer exist.
2011-09-23 09:45:50 -07:00
Eric Fischer
abb909024c
Merge "Delete translations of files that no longer exist." into ics-factoryrom
2011-09-23 09:43:55 -07:00
Daniel Sandler
0a1c3d524b
Merge "Put the correct background behind largeIcons."
2011-09-23 09:33:18 -07:00
Pannag Sanketi
c40e465bc2
am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
...
* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
Returning EOS in SurfaceMediaSource:read
2011-09-23 09:08:11 -07:00
Pannag Sanketi
f42489003e
Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
2011-09-23 09:06:55 -07:00
Wei Huang
2e9311c6f4
am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom
...
* commit '5d87227bad8126d701145cd07c3ac2a365e8480e':
Clear callbacks in camera stopPreview.
2011-09-23 08:33:46 -07:00
Wei Huang
9de9110452
Merge "Clear callbacks in camera stopPreview." into ics-factoryrom
2011-09-23 08:30:32 -07:00
Brandon Keely
f61d5145f9
Merge "Make LockScreen ping() on a miss."
2011-09-23 07:46:30 -07:00