Jean-Michel Trivi
149f52dff6
Merge "Bug 5045498 RemoteControlClient interface"
2011-08-17 16:54:37 -07:00
Adam Powell
d7e0792bd3
Merge "Fix bug 533274 - Menu key opens wrong menu in action mode"
2011-08-17 16:53:03 -07:00
Mathias Agopian
9a6e71d14f
Merge "don't return the current buffer from dequeueBuffer"
2011-08-17 16:45:35 -07:00
Mathias Agopian
fcdafba030
Merge "fix a small race condition when returning the default width/height of a SurfaceTexture"
2011-08-17 16:45:23 -07:00
Daniel Sandler
8e044f11eb
Merge "Fix drawing artifacts on glowing navigation buttons."
2011-08-17 16:22:01 -07:00
Daniel Sandler
5dfb70a65e
Merge "Allow views to setSystemUiVisibility() with the same value and have it work."
2011-08-17 16:21:38 -07:00
Jason Sams
eb412134f6
Merge "Add structure to pack params for forEach. This allows the driver to not pass all the sub-params."
2011-08-17 16:13:54 -07:00
Romain Guy
5e31573281
Merge "Add RenderScript fragment shader test"
2011-08-17 15:53:01 -07:00
Adam Powell
fef6326684
Merge "Fix bug 5167786 - make sure custom option panels still work."
2011-08-17 15:49:38 -07:00
Mathias Agopian
29b5762efc
don't return the current buffer from dequeueBuffer
...
we were not reseting mCurrentTexture in some situations
which in turn caused dequeueBuffers() return a
"FREE" buffer that was also current.
Very often it was harmless, but it created a race with
updateTexImage() which could cause the following
queueBuffers() to fail.
Bug: 5156325
Change-Id: If15a31dc869117543d220d6e5562c57116cbabdb
2011-08-17 15:49:13 -07:00
Eric Laurent
4ba93eb2a5
Merge "Fix issue 5126270: Holding volume down vibrates"
2011-08-17 14:59:58 -07:00
Adam Powell
0293f77991
Merge "Fix bug 5168889 - action bar not respecting return codes of onCreate/Prepare menu"
2011-08-17 14:44:51 -07:00
Xavier Ducrohet
de16a5a62b
am ddf155b8: am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit 'ddf155b8338eb894a97612e4cb21257c11d8434a':
Fix String16 operator+ to actually work
2011-08-17 14:40:57 -07:00
Xavier Ducrohet
754b249bcd
am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
Fix String16 operator+ to actually work
2011-08-17 14:38:15 -07:00
Xavier Ducrohet
242915f3d0
am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
Fix String16 operator+ to actually work
2011-08-17 14:35:20 -07:00
Xavier Ducrohet
35302266fa
am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
Fix String16 operator+ to actually work
2011-08-17 14:31:08 -07:00
Xavier Ducrohet
9f4d9d148f
Merge "Fix String16 operator+ to actually work"
2011-08-17 14:18:04 -07:00
Gilles Debunne
22cf25cba6
Merge "Fix bit comparison for checking the variant of the input type."
2011-08-17 14:03:56 -07:00
Eric Fischer
a05d2f5b74
Merge "Remove translations that contain mangled format strings."
2011-08-17 13:47:39 -07:00
Alex Sakhartchouk
9f6d58b773
Merge "Fixing asynchronous performance issues."
2011-08-17 13:29:24 -07:00
Andreas Huber
ca9adcac53
Merge "Make sure we have all the sample table metadata before declaring a track valid."
2011-08-17 13:21:40 -07:00
Claudia de Veaux
99e0a743f0
Merge "Edits to remove "fail" references, plus edits to "stopped by mistake" dialog. Bugs: 5174094 and 5165745"
2011-08-17 12:52:04 -07:00
Mathias Agopian
3902be629b
fix a small race condition when returning the default width/height of a SurfaceTexture
...
Change-Id: I581bf609505dfb5d4ec5957b2ef2c77df6cfb15f
2011-08-17 12:45:40 -07:00
Adam Cohen
3cff0866a2
Merge "Getting rid of the (hidden) oldName parameter for widgets"
2011-08-17 11:39:32 -07:00
Justin Ho
21d4505078
Merge "Updated day_picker Bug: 5076695"
2011-08-17 11:17:32 -07:00
James Dong
16e4a7ab41
Merge "Don't time out prematurely for video encoding waiting for output buffers"
2011-08-17 11:14:49 -07:00
Alon Albert
fd96ed248d
Merge "Check for periodic sync that is in the future Bug: 5164762 Change-Id: If578737bcfc4f83756f75c516657afdfc601caf1"
2011-08-17 10:34:35 -07:00
Eric Laurent
0454f26183
Merge "Change condition to enter silent mode."
2011-08-17 10:19:06 -07:00
Mathias Agopian
eb2f227faf
Merge "as a debug option SrufaceFlinger can now connect to DDMS"
2011-08-17 09:58:33 -07:00
Joe Fernandez
d14ed8f9f9
Merge "docs: OpenGL ES 1.0 and 2.0 Tutorials"
2011-08-17 09:31:45 -07:00
Justin Ho
5e5e311e29
Merge "New spinners Bug: 5165176"
2011-08-17 09:13:16 -07:00
Daniel Sandler
7d3d492a15
Merge "Remove longpress support from the software Home key."
2011-08-17 06:48:13 -07:00
Daniel Sandler
7f5e2c425b
Merge "Breathing room between RSSI and battery on tablets."
2011-08-17 06:47:11 -07:00
Svetoslav Ganov
9f219a950b
Merge "Breaks the build"
2011-08-17 05:27:07 -07:00
Chih-Chung Chang
b23bef1cb5
Merge "Display thumbnails one by one and cache them."
2011-08-17 04:41:33 -07:00
Svetoslav Ganov
fd7dc49bcd
Merge "Adding accessibility support to the PIN lock screen."
2011-08-17 04:31:37 -07:00
Kristian Monsen
8afaea9f6c
Merge "Fix for bug 3429537 Google voice (web version) does not play messages on HC"
2011-08-17 02:41:39 -07:00
Kristian Monsen
620d3efec8
Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
2011-08-17 02:41:00 -07:00
Ben Murdoch
9bf4770933
Merge "No need to pass an AssetManager to native when creating a WebView"
2011-08-17 02:28:52 -07:00
Dianne Hackborn
9ea82b2e91
am 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit '51beb81a8e901020293b7a30a68b405bca71d258':
Handle stopping of services with still bound applications.
2011-08-16 20:47:39 -07:00
Dianne Hackborn
c9514d2dad
am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit 'ee93fd5c0d7b0296fca17363ec00dc2ee63a0841':
Handle stopping of services with still bound applications.
2011-08-16 20:45:19 -07:00
Dianne Hackborn
bf046a8e05
am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit '7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
Handle stopping of services with still bound applications.
2011-08-16 20:42:17 -07:00
Dianne Hackborn
e0233e99cd
am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
Handle stopping of services with still bound applications.
2011-08-16 20:39:50 -07:00
Dianne Hackborn
96fe23ed7b
Merge "Handle stopping of services with still bound applications."
2011-08-16 19:29:25 -07:00
James Dong
d4ee2db4dd
Merge "Use camcorder profiles for MediaRecorderStressTest"
2011-08-16 18:26:54 -07:00
Scott Main
b281d34035
Merge "cherrypick Change-Id: I245fcc37495196b46d1930f74bdb7632fc106af2 docs: update ndk requirements issue 5157542"
2011-08-16 18:26:34 -07:00
Fabrice Di Meglio
69814e5524
Merge "Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic"
2011-08-16 17:35:06 -07:00
Christopher Tate
cf71e12fe0
Merge "Don't crash if a drag recipient throws an uncaught exception"
2011-08-16 17:03:24 -07:00
Adam Powell
4737c83523
Merge "Fix bug 5048082 - Conversation doesn't scroll after you send a message"
2011-08-16 16:46:48 -07:00
Amith Yamasani
8b378522bd
Merge "Rename an asset and update ic_commit_* drawables."
2011-08-16 16:45:13 -07:00