Chia-chi Yeh
83c5bfc7d7
Merge "VPN: reset legacy VPN when resetting IPv4 addresses."
2011-08-16 14:25:30 -07:00
Fred Quintana
6a175aea72
Merge "add the Identity contacts mimetype Bug: 5061729"
2011-08-16 14:19:59 -07:00
Mike Lockwood
fa8005fbb0
Merge "UsbManager: Use resource IDs for notification IDs"
2011-08-16 14:06:59 -07:00
Romain Guy
c7abdeefee
Merge "Add an API to set the transform on a TextureView's surface texture. Bug #5156689 "
2011-08-16 13:56:38 -07:00
Amith Yamasani
847eba245a
Merge "Updated audio volume icons."
2011-08-16 13:35:50 -07:00
Dianne Hackborn
f69e4b7f0e
Merge "Small improvements to am command."
2011-08-16 13:26:12 -07:00
Gilles Debunne
77d68ff88b
Merge "Change the behavior of SuggestionSpan."
2011-08-16 13:23:25 -07:00
Daniel Sandler
a393af03a0
Merge "Make the navigation bar opaque."
2011-08-16 13:11:04 -07:00
Adam Powell
195a8de320
Merge "Offer a masked version of setUiOptions for windows to only modify certain flags."
2011-08-16 13:10:55 -07:00
Mike Lockwood
812e4c7711
Merge "dumpsys: fix problems with -a option in battery and batteryinfo services"
2011-08-16 13:07:17 -07:00
Andreas Huber
3ea2a22d58
Merge "Properly initialize some instance variables."
2011-08-16 13:06:19 -07:00
Amith Yamasani
2063aeca57
Merge "Voice search icon replaced by X on typing."
2011-08-16 12:45:08 -07:00
Amith Yamasani
4975aa1e5b
Merge "Accessibility strings for search view components."
2011-08-16 10:40:02 -07:00
Robert Greenwalt
5b95dea301
Merge "Flush central DNS cache when things change."
2011-08-16 09:41:54 -07:00
Robert Ly
23492a84aa
Merge "docs: cherrypick from hc-mr2 Change-Id: I42d2befab1c848dc0b9aa5b4c5ac25ee50bd9a7b"
2011-08-16 09:17:35 -07:00
Kenny Root
ea2efa558c
Merge "Infrastructure to support package verifier"
2011-08-16 08:35:53 -07:00
Kenny Root
7e6d0347b2
Merge "Throw exception on odd length Signatures"
2011-08-16 08:34:22 -07:00
Justin Ho
a53e7f15b1
Merge "Updated frameworks/base/core assets Bug: 5076695"
2011-08-16 07:33:43 -07:00
Ben Murdoch
c94f72d2fb
Merge "Add a function to query the available memory on the device."
2011-08-16 02:11:45 -07:00
Mathias Agopian
8afb7e39a8
as a debug option SrufaceFlinger can now connect to DDMS
...
this is disabled by default. To enable:
setprop debug.sf.ddms 1
this debug option requires to restart SurfaceFlinger
Change-Id: Ic2f8050b29911b55bcd21721648b6978700c277d
2011-08-15 20:44:40 -07:00
Dianne Hackborn
37fb2791fb
Merge "Fix build."
2011-08-15 19:22:25 -07:00
Adam Powell
b8b4c4c659
Merge "Fix bug 5167078 - Show a 'cheat sheet' popup for icon-only action buttons"
2011-08-15 19:06:54 -07:00
Dianne Hackborn
2a4565af1a
Merge "Add new am option to profile the launching of an activity."
2011-08-15 18:57:57 -07:00
Daniel Sandler
329f6dbec4
Merge "Fix the crazy RSSI icons."
2011-08-15 18:51:04 -07:00
Jeff Sharkey
cda56be783
Merge "Foreground/background network stats using sets."
2011-08-15 18:44:15 -07:00
Jeff Sharkey
4889992ff8
Merge "Add NativeDaemonConnector users to watchdog."
2011-08-15 18:43:54 -07:00
Fabrice Di Meglio
e3675a334b
Merge "Fix bug #3388534 Long file names are improperly displayed when played"
2011-08-15 18:40:34 -07:00
Jeff Brown
a4e22480d7
Merge "Find next focus id from inside-out. Bug: 5165543"
2011-08-15 18:21:54 -07:00
Jeff Sharkey
3ba60f4461
Merge "Adjust holo tabs to match spec."
2011-08-15 18:17:43 -07:00
Romain Guy
93963bde30
Merge "Fix synchronization issue in ArrayAdapter External bug #19235 "
2011-08-15 18:15:22 -07:00
Adam Powell
53ff168e16
Merge "Fix bug 5049406 - ActionBar UP with no home icon, tap highlight looks broken"
2011-08-15 18:09:47 -07:00
Matthew Xie
7f20de3236
Merge "Change prepare bluetooth timeout from 7 seconds to 10 seconds"
2011-08-15 18:01:57 -07:00
Eric Laurent
9a6cf5d9d7
Merge "Fix issue 5131056: key beeps when screen is locked"
2011-08-15 18:01:37 -07:00
Jaikumar Ganesh
cbc58452d8
Merge "Add utility functions for pause and tonewait pause."
2011-08-15 17:33:21 -07:00
Jaikumar Ganesh
dfae44030c
Merge "Fix stuck in pairing when BT is turned off."
2011-08-15 17:33:12 -07:00
Jean-Michel Trivi
9a62aaaabf
Merge "Bug 5045498 javadoc for the remote control client API"
2011-08-15 17:14:04 -07:00
Jean-Michel Trivi
91e7b14365
Merge "Bug 5045498 Send media button event receiver to remote control"
2011-08-15 17:12:33 -07:00
Mathias Agopian
ddc864e6be
Merge "have the sensorsevice test print the delay of the first received event"
2011-08-15 17:11:49 -07:00
Adam Powell
08935c6ed6
Merge "Fix bug 5165223 Fix Holo Spinner item/dropdown alignment."
2011-08-15 17:05:42 -07:00
Eric Laurent
d16e88b229
Merge "Deprecate use of some audio effects on output mix."
2011-08-15 15:49:55 -07:00
Mathias Agopian
579c90b3d2
Merge changes I4d4580e8,I47b21293,I0767ac2a
...
* changes:
fix test-opengl-swapinterval
revert last change to EGLUtils::selectConfigForPixelFormat
boot animation doesn't use EGLUtils anymore
2011-08-15 15:44:33 -07:00
Mathias Agopian
7dddeac971
fix test-opengl-swapinterval
...
EGLConfig selection should now work on any device
Change-Id: I4d4580e891d1faf817fa853838406fb49d12e50a
2011-08-15 15:25:40 -07:00
Mathias Agopian
f9606df42b
revert last change to EGLUtils::selectConfigForPixelFormat
...
EGLUtils::selectConfigForPixelFormat is only used by
command line tests and it simply selects a config
based on the EGL_NATIVE_VISUAL_ID.
2011-08-15 15:25:39 -07:00
Eric Fischer
97f8767ebe
Merge "Import revised translations."
2011-08-15 13:22:31 -07:00
Kenny Root
e010f5d0a6
Merge "Fix external size calculations"
2011-08-15 13:20:34 -07:00
Jeff Brown
abb769a8dc
Merge "Fix blocked event handling in InputDispatcher. Bug: 5161854"
2011-08-15 13:09:08 -07:00
Robert Ly
a1c5953cc4
Merge "docs: fix for bug 5057581"
2011-08-15 12:16:41 -07:00
Matthew Xie
0998f5b28d
Merge "Implement switchConnectable with Powered property setting instead of scan modes"
2011-08-15 11:49:31 -07:00
Bart Sears
6524ecec3c
Merge "Fix xml coding style (turn tabs to spaces)"
2011-08-15 11:43:40 -07:00
Daniel Lehmann
7ad6322540
Merge "Renaming com.google.i18n.phonenumbers to com.android.i18n.phonenumbers to avoid name collision."
2011-08-15 11:39:58 -07:00