Bart Sears
325daa7336
Merge "Update Droid Fonts" into honeycomb-mr1
2011-03-14 19:24:02 -07:00
Adam Powell
5ec9119256
Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
2011-03-14 18:32:45 -07:00
Justin Ho
0ff0466b2d
Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1
2011-03-14 18:24:13 -07:00
Justin Ho
83d83cb42a
Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
2011-03-14 18:24:06 -07:00
Justin Ho
7ebaeaec62
Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1
2011-03-14 18:23:18 -07:00
Romain Guy
b6549c81ee
Merge "Fix rendering artifact in edge fades. Bug #4092053 " into honeycomb-mr1
2011-03-14 18:16:39 -07:00
Dirk Dougherty
c090fb2f55
am 2f1d2ce1: Merge "Doc change: updated home tab announce post-GDC" into honeycomb
...
* commit '2f1d2ce1f2d58f959adaf8ce514d39970210331a':
Doc change: updated home tab announce post-GDC
2011-03-14 17:50:06 -07:00
Dirk Dougherty
fb2a846013
Merge "Doc change: updated home tab announce post-GDC" into honeycomb
2011-03-14 17:44:28 -07:00
Jamie Gennis
827ebdbbff
Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1
2011-03-14 17:42:48 -07:00
Mike Lockwood
e1092edebc
Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
2011-03-14 17:42:04 -07:00
Mike Lockwood
b773befa81
Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
2011-03-14 17:39:43 -07:00
Shailendra Yadav
de7426d7e2
Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1
2011-03-14 17:23:05 -07:00
Gloria Wang
848ddad0a3
Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
2011-03-14 17:02:58 -07:00
Scott Main
02451ddf6c
am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb
...
* commit 'c2366c898abacb4b6e3723f6cad522615a2b304e':
docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
2011-03-14 16:42:28 -07:00
Scott Main
1bc0a08a95
am 7b013bb5: docs: release notes for ADT 10.0.1
...
* commit '7b013bb579a9bc372b30e2e520f6e200f6c2b1b9':
docs: release notes for ADT 10.0.1
2011-03-14 16:42:17 -07:00
Scott Main
1b87152752
Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb
2011-03-14 16:08:09 -07:00
Nicolas Roard
579a30dca2
Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1
2011-03-14 15:26:58 -07:00
Xavier Ducrohet
520eb2f5b5
Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1
2011-03-14 15:24:20 -07:00
Nicolas Roard
c9eb44612b
Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1
2011-03-14 15:11:55 -07:00
Jamie Gennis
1a4efdc224
Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1
2011-03-14 14:49:37 -07:00
Huahui Wu
b9ab7f5478
Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1
2011-03-14 14:43:46 -07:00
Scott Main
529031662f
am abdf0d53: docs: update search dev guide with SearcView widget
...
* commit 'abdf0d533c292709e51cee2c1213d5e44baca963':
docs: update search dev guide with SearcView widget
2011-03-14 14:36:56 -07:00
Eric Fischer
b066ddc849
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-14 14:17:01 -07:00
Eric Fischer
230de7bfc0
Merge "Add "new incognito window" translations." into honeycomb-mr1
2011-03-14 14:13:29 -07:00
Irfan Sheriff
bd9100b11b
Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
2011-03-14 11:48:35 -07:00
Jamie Gennis
d99c088f35
SurfaceTexture: fix transform matrix computation.
...
This change fixes the transform matrix computation in SurfaceTexture
when a crop rectangle is specified by the image producer. It also adds
a test for this case as well as a basic test for the uncropped case.
Bug: 4070775
Change-Id: I1481c9ce9d08fe7f2bff86d3afdeab7d4002b157
2011-03-14 11:30:16 -07:00
Jamie Gennis
181f1c33c2
gl2_yuvtex: use the gralloc-provided stride.
...
This change fixes the gl2_yuvtex test to use the stride chosen by the
gralloc implementation rather than hard-coding it.
Bug: 4081948
Change-Id: If7c96a20fc3fb1df2ff25e6afaa9f34dbad2002c
2011-03-14 11:30:02 -07:00
Gilles Debunne
4e29229f65
Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1
2011-03-14 11:26:36 -07:00
Eric Laurent
ee76b4c19d
Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1
2011-03-14 11:21:50 -07:00
Mike Lockwood
bd7c76eb79
Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1
2011-03-14 09:43:14 -07:00
Gloria Wang
50e4bf4895
Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1
2011-03-14 09:32:58 -07:00
Mike Lockwood
6f1547b9a4
Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
2011-03-14 04:02:50 -07:00
Mike Lockwood
0b72b4ebec
Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1
2011-03-14 04:02:29 -07:00
Christopher Tate
96b60ba644
Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1
2011-03-11 18:22:37 -08:00
Dianne Hackborn
884c4106e2
Merge "Fix issues #4087362 and #4087356 " into honeycomb-mr1
2011-03-11 18:01:47 -08:00
Mike Lockwood
103a217104
Merge "USB: minor cleanup work" into honeycomb-mr1
2011-03-11 17:52:36 -08:00
Adam Powell
ba23ee2d57
Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1
2011-03-11 16:39:42 -08:00
Glenn Kasten
9f669c5391
Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1
2011-03-11 16:31:55 -08:00
Nicolas Roard
52d2b87932
Merge "HTML5 Video improvements" into honeycomb-mr1
2011-03-11 14:35:32 -08:00
Mike Lockwood
fd30a36d99
Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
2011-03-11 13:24:01 -08:00
Joe Malin
6cc95a9743
am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
...
* commit '9f18729676a58cdfcee98db3329de3397c657d48':
DOC CHANGE: Fix 4084450 monkeyrunner_concepts
2011-03-11 13:10:29 -08:00
Joe Malin
447b17ba91
Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
2011-03-11 13:08:59 -08:00
Mike Lockwood
e195b4bc54
Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
...
* changes:
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
2011-03-11 10:57:06 -08:00
Christopher Tate
6fc20b07d7
Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
2011-03-11 10:45:17 -08:00
Dianne Hackborn
1f8c98d091
Merge "Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
2011-03-11 10:39:46 -08:00
Dianne Hackborn
3a9c0a05bb
Merge "Fix issue #4081756 : Crash when un-stopping applications" into honeycomb-mr1
2011-03-11 10:38:52 -08:00
Glenn Kasten
2ee08a1694
Merge "Bug 3012968 DRM output control" into honeycomb-mr1
2011-03-11 08:43:05 -08:00
Mike Lockwood
1fc8136de0
Merge "Support for USB accessory URIs" into honeycomb-mr1
2011-03-11 05:56:50 -08:00
Jim Miller
21daa912d8
Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
2011-03-10 22:59:57 -08:00
Justin Ho
d295c2701c
Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
2011-03-10 22:31:29 -08:00
