Jeff Brown
f2074ccfd8
Merge "Exorcise notification panel ghosts. Bug: 5105599"
2011-08-11 17:23:38 -07:00
Jeff Brown
f36d34f634
Merge "Improve touch device configuration. Bug: 5064702"
2011-08-11 17:23:05 -07:00
Marco Nelissen
a911a0f908
Merge "Only set the ringtones and such if this is the first media scan b/5126979"
2011-08-11 16:29:20 -07:00
Jeff Brown
4f8629eb3f
am 29ccd2a1: am 8f226dcb: (-s ours) am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
...
* commit '29ccd2a1b3bc2defb97fa4d76ed031a60181224a':
Fix getSwitchState according to device capabilities.
2011-08-11 16:20:29 -07:00
Jeff Brown
5329585e71
am 56d377c0: am b4459d8d: (-s ours) am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
...
* commit '56d377c027e223d2baffafb437d98443973e9798':
Support wrapping app processes to inject debug instrumentation. Bug: 4437846
2011-08-11 16:18:30 -07:00
Jeff Brown
0b7ad37bf7
am 8f226dcb: (-s ours) am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
...
* commit '8f226dcb21c84f5479a0a1b2d6486293dcd2e937':
Fix getSwitchState according to device capabilities.
2011-08-11 16:15:31 -07:00
Dave Santoro
8cc1b1f12d
Merge "Update read/write profile permission descriptions."
2011-08-11 16:14:28 -07:00
Jeff Brown
98827f95c6
am b4459d8d: (-s ours) am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
...
* commit 'b4459d8d6d5377db2494f5a11124d49194f1044c':
Support wrapping app processes to inject debug instrumentation. Bug: 4437846
2011-08-11 16:13:11 -07:00
Elliott Hughes
5828b3edc0
Merge "Manually merge the changes made in honeycomb-mr2 to get this on the web."
2011-08-11 15:52:21 -07:00
Jean-Baptiste Queru
37717b58dc
am b654e6e5: am d144748d: Merge "Add missing include"
...
* commit 'b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05':
Add missing include
2011-08-11 15:22:42 -07:00
Jean-Baptiste Queru
e636a8ad44
am d144748d: Merge "Add missing include"
...
* commit 'd144748d4767b2ccfb13857e23f78bc944e9531d':
Add missing include
2011-08-11 15:18:22 -07:00
Christopher Tate
e81372fa1c
Merge "Fix partial-read handling during restore"
2011-08-11 15:07:25 -07:00
Adam Powell
04c8a78617
Merge "More fun with action bars and themes!"
2011-08-11 14:59:52 -07:00
Gilles Debunne
1542c60421
Merge "Added support for colored / thick underlined text."
2011-08-11 14:50:00 -07:00
Eric Laurent
c3ed6b98b3
Merge "Audio effects: track CPU and memory use separately"
2011-08-11 14:40:04 -07:00
Justin Ho
f4c3ea09b1
Merge "Updated scrubber_control assets, adding pressed state Bug: 5076695"
2011-08-11 14:39:03 -07:00
Justin Ho
83395998bb
Merge "Updated progressbar_indeterminate and scrollbar_handle Bug: 5076695"
2011-08-11 14:14:48 -07:00
Justin Ho
7e6cf4bdbe
Merge "Updated textfields Bug: 5076695"
2011-08-11 14:08:38 -07:00
Jean-Baptiste Queru
dbd5be5408
Merge "Add missing include"
2011-08-11 13:46:09 -07:00
Jean-Baptiste Queru
2327ffac7d
Add missing include
...
Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
2011-08-11 13:36:04 -07:00
Kenny Root
36e0adda45
Merge "Better errors from copyResource"
2011-08-11 13:27:10 -07:00
Amith Yamasani
23f1724cf7
am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
...
* commit '5f07406717db34927f5095de3829b1e74ebd7c16':
VolumePreference.onActivityStop only stops playback
2011-08-11 12:46:25 -07:00
Amith Yamasani
49934b48b3
am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
...
* commit '712a8cca1f9e438af224f93c3a4644853331af2e':
VolumePreference.onActivityStop only stops playback
2011-08-11 12:43:44 -07:00
Amith Yamasani
431d7beafe
Merge "VolumePreference.onActivityStop only stops playback"
2011-08-11 12:29:34 -07:00
Jean-Baptiste Queru
65adf39c38
am 44874c23: am c962512c: Merge "added stub for getting buffer from surface texture"
...
* commit '44874c236de282b0d898f179fc9fdafa84aae40d':
added stub for getting buffer from surface texture
2011-08-11 12:24:51 -07:00
Jean-Baptiste Queru
9f3a33a671
am c962512c: Merge "added stub for getting buffer from surface texture"
...
* commit 'c962512cac19e2bb1103c0c1a5f739d40d4d7740':
added stub for getting buffer from surface texture
2011-08-11 12:19:44 -07:00
Debashish Chatterjee
c45d869f96
Merge "Added FETCH_VOICEMAIL intent definition in VoicemailContract."
2011-08-11 12:19:01 -07:00
Chet Haase
a7552198ae
Merge "Fix behavior of custom animations for LayoutTransition."
2011-08-11 12:16:41 -07:00
Jean-Baptiste Queru
cff1acf568
Merge "added stub for getting buffer from surface texture"
2011-08-11 12:08:04 -07:00
Chris Craik
f81c168a7a
added stub for getting buffer from surface texture
...
Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
2011-08-11 11:56:59 -07:00
Romain Guy
8035c2f06f
Merge "Document threading limitations on various View methods Bug #5150923 "
2011-08-11 11:44:11 -07:00
Matthew Xie
6457b58140
Merge "Revert "Implement switchConnectable with Powered property setting instead of scan modes""
2011-08-11 11:42:09 -07:00
Dianne Hackborn
63638f4dbc
Merge "Fix issue #5016544 : IME keyboard hides folder rename text field."
2011-08-11 11:38:32 -07:00
Dianne Hackborn
4968f28b84
Merge "New broadcast telling when an app is fully removed."
2011-08-11 11:35:07 -07:00
Marco Nelissen
5160988bf6
Merge "Add Bluetooth SCO test app"
2011-08-11 11:10:44 -07:00
Chet Haase
33aecb24c1
Merge "Fix Recent Apps jumping artifact"
2011-08-11 11:10:32 -07:00
Ben Murdoch
fb95d403d0
Merge "Allow fractional and signed input for number fields."
2011-08-11 10:29:56 -07:00
Robert Greenwalt
a36ac5b02c
Merge "Remove default routes for non-default networks."
2011-08-11 09:55:08 -07:00
Dave Burke
544ea69c90
Merge "Revert "error out when SurfaceTexture APIs are called while not connected""
2011-08-11 07:21:19 -07:00
Dave Burke
4925ee11f9
Revert "error out when SurfaceTexture APIs are called while not connected"
...
This reverts commit a04cda9986366ab480ad8008c4d923271b05d78e.
Conflicts:
include/gui/SurfaceTexture.h
libs/gui/SurfaceTexture.cpp
Change-Id: Ib655016462c496ee2a27f7cb33a6e8b18cfe684a
2011-08-11 15:13:19 +01:00
Daniel Sandler
7332e8202b
Merge "Remove logspew."
2011-08-11 05:17:14 -07:00
Daniel Sandler
298b779f41
Merge "Remove obsolete assets."
2011-08-11 05:17:09 -07:00
Daniel Sandler
a133d64206
Merge "Clean up some effects in the phone notification panel."
2011-08-11 05:17:03 -07:00
Daniel Sandler
a1987fa263
Merge "Fix fullScreenAlert test."
2011-08-11 05:16:53 -07:00
Kristian Monsen
45e323c87d
Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
2011-08-11 03:02:29 -07:00
Adam Powell
6ccc095fd6
Merge "Fix bug 5122319 - When action bar tabs run out of space they should collapse in to a spinner."
2011-08-10 23:29:57 -07:00
Mathias Agopian
3477588d13
Merge "Read leftover parcel data when a parceled Surface is found in the cache."
2011-08-10 19:45:34 -07:00
Mathias Agopian
f440f670a4
Merge changes I5174a6ec,I1f8538b6,Idb71fdcf
...
* changes:
fix a crasher in SurfaceTexture::updateTexImage()
rework dequeueBuffer()'s main loop.
error out when SurfaceTexture APIs are called while not connected
2011-08-10 19:40:48 -07:00
Mathias Agopian
b2928c9068
Merge "Fix typos and use new HAL_PRIORITY_URGENT_DISPLAY constant"
2011-08-10 19:40:15 -07:00
Daniel Sandler
8cc43181c6
Merge "Subtract the navigation bar from DisplayMetrics."
2011-08-10 18:54:20 -07:00
