Glenn Kasten
ad4c66d8bb
Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
2011-03-15 13:44:58 -07:00
Mike Lockwood
a2863eba79
Merge "USB Manager string clean up:" into honeycomb-mr1
2011-03-15 13:34:06 -07:00
Svetoslav Ganov
3bec96dff1
Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
2011-03-15 13:23:17 -07:00
Mike Lockwood
b98c4305b5
Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
2011-03-15 13:20:58 -07:00
Adam Powell
c31fd2fdb9
Merge "Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge" into honeycomb-mr1
2011-03-15 12:06:45 -07:00
Stephen Hines
2cfe828a78
Merge "Make RS Matrix functions threadable." into honeycomb-mr1
2011-03-15 11:52:36 -07:00
Jamie Gennis
7a4ac6d0ff
Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1
2011-03-15 11:39:24 -07:00
Romain Guy
993b519082
Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871 " into honeycomb-mr1
2011-03-15 11:31:22 -07:00
Scott Main
295e6edfaf
am e8f95e7f: docs: update device dashboard
...
* commit 'e8f95e7f353d6205dbb09cc440f47256604229ee':
docs: update device dashboard
2011-03-15 11:28:50 -07:00
Amith Yamasani
a64eb19581
Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
2011-03-15 10:47:01 -07:00
Jamie Gennis
5c0c93a8c4
SurfaceTexture: disallow unsupported uses.
...
This change makes the ANativeWindow_lock NDK function error out if it is
passed an ANativeWindow with a concrete type that is not Surface. It
also makes eglCreateWindowSurface fail if it is passed a
SurfaceTextureClient as its 'window' argument.
Bug: 4087277
Change-Id: Ie68c50c52d88f72d8a387f6c094908044c83a88c
2011-03-15 10:37:37 -07:00
Jamie Gennis
f9a20d77fa
Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1
2011-03-15 10:34:35 -07:00
Jamie Gennis
3c742ef11b
Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
2011-03-15 10:33:35 -07:00
Svetoslav Ganov
f15a7cdbfb
Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
2011-03-14 23:13:49 -07:00
satok
6fbddcf3af
Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
2011-03-14 22:44:23 -07:00
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
Glenn Kasten
bb959f5b10
Bug 4016329 do full string comparisons
...
Use full string comparisons instead of partial for
file extension and MIME type.
Do case-insensitive comparison of MIME type and file extensions.
Fix error in comment for String8::getPathExtension.
Remove dead code -- StringTokenizer is unused.
Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
2011-03-14 17:59:51 -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
Jamie Gennis
bae774eb20
SurfaceTextureClient: Add ISurfaceTexture getter.
...
This change adds a getter method to SurfaceTextureClient to get the
ISurfaceTexture object with which the SurfaceTextureClient is
communicating.
Bug: 4086509
Change-Id: Ifec621e0fe5392a5be56b2348fdc54067cbebcdd
2011-03-14 17:47:11 -07:00
Jamie Gennis
391bbe2246
ANativeWindow: add query for the concrete type.
...
This change adds a query to the ANativeWindow interface for getting the
concrete type of the ANativeWindow.
Bug: 4086509
Change-Id: I64aa86d72fbca3b52a98e1fc35608737781a3178
2011-03-14 17:47:11 -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
