Commit Graph

24051 Commits

Author SHA1 Message Date
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
Gilles Debunne
90a85fed7c Merge "Text selection can be started with a double tap in TextView" 2010-10-27 14:56:22 -07:00
Kristian Monsen
a0dcbcc9bd Merge "Fix for simulator build" 2010-10-27 14:56:10 -07:00
Michael I. Gold
6ecdb49b25 YUV texturing test.
Change-Id: Ib2a6b7eb2a5fc98ecaace032d6c63d50613aaa0d
2010-10-27 14:51:43 -07:00
Chet Haase
6061eb8733 Merge "Use ThreadLocal for static Animator variables." 2010-10-27 14:51:32 -07:00
Kristian Monsen
72c384e0a1 Fix for simulator build
The code looks correct, but causes an internal compiler error on
simulator builds on mine (an other) gLucid desktops.

Change-Id: Iaf0d8120778ec1c6fc739ef13e6eaaac53e3bcc8
2010-10-27 22:49:34 +01:00
Amith Yamasani
a28ced6a40 Merge "Wallpaper transition changed to fade instead of translate/scale/fade." 2010-10-27 14:02:09 -07:00
Andy McFadden
6fd9624fcd am e3e8642c: am 001c7d12: Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:28:17 -07:00
Andy McFadden
23cff1cc79 am 001c7d12: Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:25:29 -07:00
Andy McFadden
d2a5a8f3d1 Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:22:50 -07:00
Gil Dobjanschi
43c587a172 Merge "Waveform member variables must be private" 2010-10-27 12:37:34 -07:00
Joe Onorato
c8968ed2c5 Merge "Make the low battery dialog work again." 2010-10-27 12:29:32 -07:00
Joe Onorato
d8f79dcbac Merge "Move the battery LED code over to the battery service from the notification service (!)" 2010-10-27 12:29:12 -07:00
Steve Block
de9b2dd331 Merge "Hook up CookieManager.getCookie() for Chromium HTTP stack" 2010-10-27 12:29:03 -07:00
Eric Rowe
2919d0c9d4 Merge "Modify bluetooth test cases GB for new HC APIs" 2010-10-27 12:07:44 -07:00
Xavier Ducrohet
77cf116a48 am 57f7ccc4: am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread 2010-10-27 11:59:05 -07:00
Yu Shan Emily Lau
c1a04ca925 am 751cc424: am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:58:58 -07:00