Commit Graph

35906 Commits

Author SHA1 Message Date
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
RoboErik
2b9481e8b8 Merge "Add docs for Calendars table" 2011-06-17 14:41:38 -07:00
Chia-chi Yeh
88826e6f4e Merge "VPN: move VpnDialogs related methods into VpnConfig." 2011-06-17 14:37:11 -07:00
Daisuke Miyakawa
8540094985 Merge "Remove HanziToPinin.java" 2011-06-17 14:36:42 -07:00
Adam Powell
17b51e1771 Merge "Bug 4726236 - NPE at dispatchRestoreInstanceState" 2011-06-17 14:32:23 -07:00
Amith Yamasani
f3410ad0d8 Merge "Inform the InputMethodManager that a focused view has been attached." 2011-06-17 14:29:17 -07:00
Eric Laurent
e628bb1501 Merge "Fix regression in audio effect factory" 2011-06-17 14:05:31 -07:00
Adam Powell
e147fda821 Merge "Create theme attributes for small and large listPreferredItemHeight. Change default holo dialog list items to use them." 2011-06-17 13:57:07 -07:00
Stephen Hines
5a7340a395 Merge "POSITVE -> POSITIVE typo fix" 2011-06-17 13:53:20 -07:00
Stephen Hines
b67ff18d5e Merge "Add isCompatible() to RS Element." 2011-06-17 13:52:44 -07:00
David Brown
5379f294a2 Merge "Fix permissions check in IccSmsInterfaceManager.sendText()" 2011-06-17 13:15:24 -07:00
Daisuke Miyakawa
0710d4648f Merge "Add API for auto-complete ranking improvement." 2011-06-17 13:10:40 -07:00
John Reck
772eb91ede Merge "Make textZoom public" 2011-06-17 13:05:56 -07:00
Daniel Sandler
ca210f35a9 Merge "ICS updates to notification layouts." 2011-06-17 12:43:21 -07:00
Jeff Sharkey
10c5aba129 Merge "Avoid clobbering UID stats when not yet loaded." 2011-06-17 11:28:31 -07:00
Philip Milne
694b819b74 Merge "Change includeMarginsInAlignment flag to aligmentMode property." 2011-06-17 11:22:36 -07:00
John Reck
054e426e40 Merge "Add textZoom setting" 2011-06-17 10:51:23 -07:00
Jamie Gennis
28bca1a772 Merge "SurfaceTexture: enable a test that now passes." 2011-06-17 10:45:15 -07:00
Jamie Gennis
4661a50121 Merge "SurfaceTexture: enable a test that is now passing." 2011-06-17 10:45:01 -07:00
Irfan Sheriff
a5d569451e Merge "Fix IP address cleanup on network disconnect" 2011-06-17 10:09:36 -07:00
Daniel Sandler
156cd35f95 Merge "Make the Notify Builder test usable on phones." 2011-06-17 05:58:59 -07:00
Wu-cheng Li
77a61dcd3a Merge "Mention device policay manager in Camera.open javadoc." 2011-06-17 00:18:21 -07:00
Irfan Sheriff
5c5ba7eb9a Merge "Fix network state handling" 2011-06-16 20:54:04 -07:00
Chia-chi Yeh
2ed48f4e5d Merge "VPN: make the file descriptor non-blocking by default." 2011-06-16 19:03:57 -07:00
Jim Miller
27be8cf10b Merge "Update GridLayout constructors to properly handle DEBUG=true" 2011-06-16 18:32:44 -07:00
Adam Powell
746d24e918 Merge "Dialog-o-rama!" 2011-06-16 18:31:18 -07:00
Mathias Agopian
a2ceb7bc2a am 3b916233: (-s ours) am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '3b916233cbbbcc5bbc703213af5e647910956cbc':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
2011-06-16 18:18:47 -07:00
Mathias Agopian
e2fc756f7d am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '48294b0d9388cff632f0e6ae5220305d342c76fb':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
2011-06-16 18:15:19 -07:00