Steve Block
05a5bd7d8b
Merge "Hook up remaining CookieManager methods"
2010-10-29 08:51:09 -07:00
Joe Onorato
cdc31f6e87
am dbf9a02b: am ed3c7be8: Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
...
* commit 'dbf9a02b0abe7cac3c15f7cc36b95d5998927ad8':
Report the new size to wallpapers when the requested size changed.
2010-10-29 08:20:42 -07:00
Nick Pelly
38e286e561
am ba1664b3: am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
...
* commit 'ba1664b34cc33ebb6b45fccedb35298ff8b1d998':
Hide some NFC API's.
2010-10-29 08:20:28 -07:00
Joe Onorato
f8fb705371
am ed3c7be8: Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
...
* commit 'ed3c7be84255d48fe7f0454bdd51b3955698cafe':
Report the new size to wallpapers when the requested size changed.
2010-10-29 08:16:20 -07:00
Nick Pelly
4cc05cf955
am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
...
* commit '4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
Hide some NFC API's.
2010-10-29 08:15:48 -07:00
Andreas Huber
e818577ef0
Merge "Upgrade to the latest version of libwebm to fix YouTube webm playback."
2010-10-29 08:04:13 -07:00
Joe Onorato
783168c390
Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
2010-10-28 18:18:52 -07:00
Gil Dobjanschi
3f8254ed90
Merge "Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations."
2010-10-28 18:03:58 -07:00
Nick Pelly
16ebd362fe
Merge "Hide some NFC API's." into gingerbread
2010-10-28 16:47:31 -07:00
Wink Saville
c7d8f4255a
Merge "Remove an @Override that is not needed."
2010-10-28 16:05:56 -07:00
Jamie Gennis
b27cb7f5bf
Merge "OpenGL ES 1 YUV texturing test"
2010-10-28 15:44:11 -07:00
Jamie Gennis
e6bb73a1cd
Merge "YUV texturing test."
2010-10-28 15:44:01 -07:00
Brad Fitzpatrick
12406e0e90
Merge "StrictMode: optimize common case (just dropboxing)"
2010-10-28 15:08:33 -07:00
Vasu Nori
1ee677a1a0
Merge "cleanup some of the STOPSHIP comments"
2010-10-28 14:50:49 -07:00
Mike Lockwood
57c2dc52da
am faebca7f: am c9fa90f9: Merge "GPS: remove some logging" into gingerbread
...
* commit 'faebca7f4319950927759163a703dd12f2727460':
GPS: remove some logging
2010-10-28 14:32:39 -07:00
Mike Lockwood
30785a5684
am c9fa90f9: Merge "GPS: remove some logging" into gingerbread
...
* commit 'c9fa90f94b664589d584bb433e748e2b01b368c9':
GPS: remove some logging
2010-10-28 14:30:34 -07:00
Mike Lockwood
9d8eb82f14
Merge "GPS: remove some logging" into gingerbread
2010-10-28 14:28:46 -07:00
Jeff Hamilton
ae25009093
am ae5ace55: (-s ours) am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
...
* commit 'ae5ace55d9fc45bc11608c9fb59c9ee884fd9ea6':
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
2010-10-28 14:07:27 -07:00
Jeff Hamilton
a46feff24b
am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
...
* commit 'bd8ff5b5d4f4c74889ce20a0c7a2f8e0ab7b6ea9':
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
2010-10-28 14:03:40 -07:00
Jeff Hamilton
b2e6a5fb03
Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
2010-10-28 14:01:21 -07:00
Jim Miller
8e07eca806
Merge "Fix 3140348: Signature was wrong for atan2() in RS."
2010-10-28 13:55:14 -07:00
Daniel Lehmann
e38daf314e
Merge "Add API and strings for the contact-field "Relation""
2010-10-28 13:52:44 -07:00
Alon Albert
392197a313
Merge "Apply backoff to operation that caused it"
2010-10-28 13:49:15 -07:00
Dianne Hackborn
8317828418
Merge "Fix issue #3083761 : windowSoftInputMode="adjustPan" ignored on stingray"
2010-10-28 12:22:57 -07:00
Xavier Ducrohet
67c01a4c9f
Merge changes I22755f38,Id3462218
...
* changes:
Fix the layoutlib_bridge .classpath to not use the full layoutlib
Move layoutlib typeface implementation to delegate.
2010-10-28 11:15:49 -07:00
Jaikumar Ganesh
a198e1936b
Merge "Fix incoming connection problem"
2010-10-28 11:09:43 -07:00
Justin Ho
d3639627ab
am f3b87c2e: (-s ours) am 9112b8eb: DO NOT MERGE - Ringtone bugfixes (round 1)
...
* commit 'f3b87c2ebd69f96969659a4ab7f2eb55fa90189d':
DO NOT MERGE - Ringtone bugfixes (round 1)
2010-10-28 10:34:27 -07:00
Alex Sakhartchouk
bdd6f4b7db
Merge "Adding nvidia extension for limited npot support. Updating a3d loading to be async."
2010-10-28 10:32:12 -07:00
Justin Ho
92efd8abf4
am 9112b8eb: DO NOT MERGE - Ringtone bugfixes (round 1)
...
* commit '9112b8ebd22ce5c83081066bea8a424eda8bda9d':
DO NOT MERGE - Ringtone bugfixes (round 1)
2010-10-28 10:30:10 -07:00
Mike Lockwood
298173cfe4
Merge "PowerManagerService: Avoid paralysis when light events are reported frequently."
2010-10-28 08:32:31 -07:00
Mathias Agopian
c23902b27f
am 5c0efef9: am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread
2010-10-27 23:48:26 -07:00
Mathias Agopian
c2dba08cc6
am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread
2010-10-27 23:46:25 -07:00
Jaikumar Ganesh
a9d28e7506
am 70a68f95: (-s ours) am 025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\'t send incoming connections for all profiles." into gingerbread
2010-10-27 23:45:55 -07:00
Mathias Agopian
7ba6ae3970
Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread
2010-10-27 23:44:07 -07:00
Jaikumar Ganesh
98c4bc637b
am 025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\'t send incoming connections for all profiles." into gingerbread
2010-10-27 23:44:02 -07:00
Jaikumar Ganesh
c40f81047d
Merge "DO NOT MERGE Fix auto connection with headsets which don't send incoming connections for all profiles." into gingerbread
2010-10-27 23:42:43 -07:00
Jeff Brown
4c766ccea5
resolved conflicts for merge of df3cccf3 to master
...
Change-Id: I425496a9fc4e9cbc50ad6938e9dccb14827d9558
2010-10-27 22:18:43 -07:00
Jeff Brown
a3690d4fec
am 120a4594: Drop all dispatcher state when dispatcher is disabled.
2010-10-27 19:31:24 -07:00
Joe Onorato
84915907cc
Merge "Implement reminder power dialog and invalid charger dialog."
2010-10-27 19:28:03 -07:00
Joe Onorato
0e3114932f
Merge "Tapping outside the system panel shouldn't open the recent panel"
2010-10-27 19:27:12 -07:00
Jeff Brown
fef5b04203
Drop all dispatcher state when dispatcher is disabled.
...
This patch makes the dispatcher drop all of its state when it is
disabled (when the screen turns off). This ensures that the dispatcher
does not get stuck thinking a pointer is still down if the screen
turned off while the user was touching the display (such as a fat touch
while hitting the power button).
Bug: 3098344
Change-Id: If50ef5804870aa1acd3179fd4b40e3cda58dd39d
2010-10-27 18:43:51 -07:00
Mathias Agopian
883dffaa00
really fix [3118445] Transform * Transform does not work as expected
...
Two bugs were counter acting each other.
- rotation matrices are on the left-hand side of multiplies
- the transform of the overlay is applied before that of the layer
Change-Id: Ia79bd368e9b719235c89ecf244ea263f01ce906a
2010-10-27 18:04:11 -07:00
Amith Yamasani
0d57cdd891
Merge "No animation when tapping on current header in a preference screen."
2010-10-27 16:34:42 -07:00
Jaikumar Ganesh
efa73eb685
Merge "Bluetooth OBEX timeout problem."
2010-10-27 16:18:07 -07:00
Jack Palevich
6132b3703d
Trace glUniformXXv and glUniformMatrixXfv calls.
...
Change-Id: I653021d2174fa1a7343d10b0fd2c29b3e5147be6
2010-10-27 15:37:01 -07:00
Eric Fischer
182782f756
Merge "Import revised translations."
2010-10-27 15:15:34 -07:00
Nuno Subtil
ce0a5ca423
OpenGL ES 1 YUV texturing test
...
Change-Id: I295e5bce16a8ab088b99929f788f2fbbe8492b8d
2010-10-27 15:14:56 -07:00
Dianne Hackborn
cd3b025457
am 96abb48d: am aa93bcd6: Fix issue #3138926 : App\'s preferences can be lost after onPause()
2010-10-27 15:02:44 -07:00
Dianne Hackborn
ea651a23e7
am aa93bcd6: Fix issue #3138926 : App\'s preferences can be lost after onPause()
2010-10-27 14:59:28 -07:00
Andreas Huber
8b0d5979fd
Merge "Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries."
2010-10-27 14:58:42 -07:00