Andreas Huber
991b455ddb
Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on decode error."
2011-06-21 08:36:51 -07:00
Mike Lockwood
4870d23769
Merge "MTP: Add support for PTP variant of GetDeviceInfo result."
2011-06-21 05:30:02 -07:00
Svetoslav Ganov
f43864ca26
Merge "ListView do not fire accessibility hover events."
2011-06-20 21:52:31 -07:00
Wu-cheng Li
850403a777
Merge "Fix camera getMeteringAreas does not return areas correctly."
2011-06-20 21:20:32 -07:00
Jim Miller
f1880623dc
Merge "Handle dropped motion events in MultiWaveView due to high system activity"
2011-06-20 20:58:44 -07:00
David Brown
5e494d0816
Merge "Use a static flag to enable/disable CallerInfo "geoDescription" lookup"
2011-06-20 19:20:46 -07:00
Mike Lockwood
cadad410a3
Merge "USB: Make MTP/PTP toggle in the USB preferences set the default mode"
2011-06-20 18:56:26 -07:00
Adam Powell
b6674fbe73
Merge "Don't draw a middle divider on the first visible view."
2011-06-20 18:29:25 -07:00
Scott Main
397183277d
Merge "cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90 docs: fix typos"
2011-06-20 17:59:05 -07:00
Fabrice Di Meglio
c1b2f8cf21
Merge "Update BiDiTest app for adding more unit tests"
2011-06-20 17:56:07 -07:00
Dianne Hackborn
563b9a5727
Merge "Stop the holo tabs from sqeezing in to each other."
2011-06-20 17:48:03 -07:00
Daniel Sandler
fe4d50edec
am e0da3f3b: am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
...
* commit 'e0da3f3bc9aaefbf3e3737b69e91b7823f639751':
Fix crazy notification panel background.
2011-06-20 17:34:33 -07:00
Scott Main
feee73437b
am de937ac0: am bb64fa1e: docs: fix a couple typos
...
* commit 'de937ac00900de7d9c3f15328778647401eb836e':
docs: fix a couple typos
2011-06-20 17:32:40 -07:00
Daniel Sandler
d26b58be49
am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
...
* commit '444336dd5f233c59e5a222d366d2498c888664b5':
Fix crazy notification panel background.
2011-06-20 17:30:38 -07:00
Scott Main
c3b6bc9e19
am 20fe290e: am beeb7762: docs: fix broken link
...
* commit '20fe290e2c9fdaca94eb334187daf971796afd0d':
docs: fix broken link
2011-06-20 17:30:15 -07:00
Daniel Sandler
f59e969313
Merge "Fix crazy notification panel background." into honeycomb-mr2
2011-06-20 17:29:24 -07:00
Scott Main
39edd39b47
am bb64fa1e: docs: fix a couple typos
...
* commit 'bb64fa1e3dde8910397d159eaa300c4444b0073c':
docs: fix a couple typos
2011-06-20 17:28:41 -07:00
Jason Sams
dad4817f3b
Merge "First cut at RSTextureView."
2011-06-20 17:26:48 -07:00
Scott Main
fd682f1250
am beeb7762: docs: fix broken link
...
* commit 'beeb776209446ea45252af5bbc1fe8a463b2001b':
docs: fix broken link
2011-06-20 17:26:48 -07:00
Adam Powell
3b174c0fe4
Merge "Fix bug 4738084 - Padding calculation regression"
2011-06-20 17:15:45 -07:00
Robert Greenwalt
c53ff482f8
am 4906376f: Just a random fix.
...
* commit '4906376f58d617083034c5899d06a73b7c1cc114':
Just a random fix.
2011-06-20 16:46:20 -07:00
Bill Napier
30e2ad1a83
Merge "Fixed MonkeyRunner documentation"
2011-06-20 16:35:30 -07:00
Mike Lockwood
00fdba57c6
Merge "Tethering: Use UsbManager to enable/disable RNDIS"
2011-06-20 16:27:12 -07:00
Andreas Huber
a653989d8b
Merge "OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData()."
2011-06-20 16:08:06 -07:00
Ying Wang
1650bd4d31
Merge "Output Proguard options for also overlay layouts."
2011-06-20 16:06:51 -07:00
Eric Fischer
9bf8f24dc9
Merge "Import revised translations."
2011-06-20 16:02:21 -07:00
Nick Pelly
f5e32c85b6
am 6f1a8edc: am 17523abb: NFC Adapter Extras API update.
...
* commit '6f1a8edcc00db40a8ad300e15a23f7f1de298c3b':
NFC Adapter Extras API update.
2011-06-20 15:58:40 -07:00
Nick Pelly
64c4f89c5b
am 17523abb: NFC Adapter Extras API update.
...
* commit '17523abb45b7f77f35af53e895d74be13f2314e0':
NFC Adapter Extras API update.
2011-06-20 15:54:07 -07:00
Jamie Gennis
c8c5152b19
SurfaceTexture: make tests use a large framebuffer.
...
This change makes the SurfaceTexture GL tests use a large (512x512)
framebuffer. The tests now use glViewport to render to a region of the
framebuffer with a size matching that of the texture being drawn. The
Npot test pixel checks must be changed because now the rendered region
is the same size as the texture.
Change-Id: Icc41803189c25e33ba1da7d2470720f0a11f3e4b
2011-06-20 15:42:57 -07:00
Jamie Gennis
b36bb97ae3
Merge "SurfaceTexture: fix a NULL ptr dereference."
2011-06-20 15:34:00 -07:00
Jamie Gennis
1c4414091c
SurfaceTexture: fix a NULL ptr dereference.
...
This change adds a NULL check when searching the slot list in
SurfaceTextureClient for the slot corresponding to a buffer being
queued or canceled.
Bug: 4645023
Change-Id: I806cbc1e34da118ea33a83c4f25ce8193ba1c3ad
2011-06-20 14:16:49 -07:00
James Dong
24f3ebb275
Merge "When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF."
2011-06-20 13:23:14 -07:00
Conley Owens
370377fd35
am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
...
* commit 'c1b62e3ba91d69dd75569b480aec55be8f808331':
Check if we are in daylight time when calculating timezone
2011-06-20 13:20:49 -07:00
Adam Powell
25e4ecf3c7
Merge "Match legacy theme colors with gingerbread"
2011-06-20 13:07:39 -07:00
Conley Owens
1894fc2765
am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
...
* commit 'bf5adfa5e558827fbb4771720433887bb3cbaefd':
Check if we are in daylight time when calculating timezone
2011-06-20 13:04:45 -07:00
Robert Greenwalt
af68797872
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
...
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
2011-06-20 12:15:24 -07:00
Eric Fischer
44ba2e4834
Merge "Add map center resources for new locales."
2011-06-20 12:03:01 -07:00
Stephen Hines
5691e05276
Merge "Add support for more vector types to RS."
2011-06-20 12:00:50 -07:00
Jamie Gennis
72ad7b42af
Merge "SurfaceTexture: attach to Dalvik when needed."
2011-06-20 11:54:34 -07:00
Robert Greenwalt
05bfbc458c
Merge "Fix tethering upstream determination." into honeycomb-LTE
2011-06-20 11:47:49 -07:00
Fabrice Di Meglio
cb046f30d7
Merge "Add View paddingStart and paddingEnd"
2011-06-20 11:35:36 -07:00
Nick Pelly
db829c382c
Merge "Parser for uri records"
2011-06-20 11:32:28 -07:00
Philip Milne
57d46519aa
Merge "Ensure measuredWidth > getSuggestedMinimumWidth(), same for height."
2011-06-20 11:12:38 -07:00
Conley Owens
a77ed0e5f6
Merge "Check if we are in daylight time when calculating timezone"
2011-06-20 11:01:41 -07:00
Robert Ly
5292656c7a
am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
...
* commit 'd1a19b10ef0bb0369fa7ed9a16fb8f8d6320e05f':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-20 09:51:08 -07:00
Robert Ly
f5b9121091
am 152e5f56: am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
...
* commit '152e5f56762c9db80d2b65fda8b13e3914f05d86':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-20 09:50:39 -07:00
Robert Ly
20d6fbd94c
am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
...
* commit 'c7c1ba5071456a813abbdadfdbe94287b06877e7':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-20 09:44:59 -07:00
Robert Ly
b41a023a5c
am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
...
* commit '329e0b9020f3b8cd1265c265cdf00b438960cbe1':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-20 09:44:55 -07:00
Robert Ly
9fcc542657
Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
2011-06-20 09:37:51 -07:00
Robert Ly
d02950e3a0
Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
2011-06-20 09:37:36 -07:00