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
Jason Sams
dad4817f3b
Merge "First cut at RSTextureView."
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
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
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
Adam Powell
25e4ecf3c7
Merge "Match legacy theme colors with gingerbread"
2011-06-20 13:07:39 -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
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
Glenn Kasten
d80fa1aa39
Merge "Remove unneeded #include <sys/resource.h>"
2011-06-20 07:47:51 -07:00
Jeff Sharkey
8c801ba2fe
Merge "Teach NetworkIdentity about roaming."
2011-06-19 22:24:49 -07:00
Jeff Sharkey
29b1024bae
Merge "Persist "tagged" network stats along with UIDs."
2011-06-19 22:07:41 -07:00
Jeff Sharkey
1c3babf3bb
Merge "Handle removed UIDs in network stats and policy."
2011-06-19 01:12:01 -07:00
Jeff Sharkey
cb1e06c940
Merge "Read "qtaguid" network stats, refactor templates."
2011-06-18 23:19:38 -07:00
Adam Powell
474feb8703
Merge "Holo dialog formatting"
2011-06-17 21:41:08 -07:00
Mike Lockwood
84957d7a13
Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands"
2011-06-17 20:54:53 -07:00
Mike Lockwood
63030e69c9
Merge "USB connected notification and temporary USB options dialog"
2011-06-17 20:54:38 -07:00
Mike Lockwood
7bff02e860
Merge "MountService: Use UsbManager to monitor USB state for mass storage"
2011-06-17 20:54:16 -07:00
Mike Lockwood
3dff247c31
Merge "USB: Support for new USB gadget drivers"
2011-06-17 20:54:00 -07:00
Adam Powell
f541ac0bbf
Merge "Allow the action bar title to take on the role of "up" in the absence of a standard "home" icon."
2011-06-17 20:32:49 -07:00
Jim Miller
54e0d4fe99
Merge "Fix 4584957: remove owner info from phone layouts"
2011-06-17 20:10:20 -07:00
Jim Miller
a32156124e
Merge "Temporary workaround for conflict in GridLayout/LockScreen."
2011-06-17 19:55:55 -07:00
Jim Miller
806f006408
Merge "Handle dropped motion events in Pattern Unlock due to high system activity"
2011-06-17 19:39:49 -07:00
Romain Guy
93de639cb1
Merge "Add error checking to LayerRenderer::copyLayer"
2011-06-17 17:47:59 -07:00
Jeff Sharkey
f714bb8329
Merge "Notify policy listeners about metered ifaces."
2011-06-17 16:57:28 -07:00
Jim Miller
b476f3aee3
Merge "Update pattern unlock and assets to match new UX design spec."
2011-06-17 16:50:34 -07:00
Mike Lockwood
8af30cbd56
Merge "Add string resource for CD installer image path"
2011-06-17 16:50:10 -07:00
Chia-chi Yeh
0b85252cf2
Merge "VPN: avoid leaking file descriptors."
2011-06-17 16:43:44 -07:00
Adam Powell
af6d64d3a8
Merge "Fix bug 4689431 - PopupMenus too narrow on phones"
2011-06-17 16:03:40 -07:00
Chet Haase
e7cd658237
Merge "Invisible views can't start animations"
2011-06-17 16:00:57 -07:00
James Dong
3d31ec0cec
Merge "Use system property to control whether we will enable B frame support in MPEG4Writer"
2011-06-17 15:50:19 -07:00
Romain Guy
b712c809d9
Merge "Fix rendering issue with paths when the stroke width is 0"
2011-06-17 15:49:22 -07:00
Philip Milne
21be7f5623
Merge "Pass width/height specs in the standard way when measuring children."
2011-06-17 15:43:13 -07:00
Chia-chi Yeh
75f1a69323
Merge "VpnDialogs: migrate to VpnConfig."
2011-06-17 15:31:54 -07:00
RoboErik
37b01ee007
Merge "Fix typo in docs link"
2011-06-17 15:28:13 -07:00
Elliott Hughes
3f5021ab9b
Merge "Make debuggable="true" imply CheckJNI."
2011-06-17 15:14:28 -07:00
Dianne Hackborn
d83ccdb12f
Merge "Implement remaining infrastructure for user disabling apps."
2011-06-17 14:53:10 -07:00
