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
a3690d4fec
am 120a4594: Drop all dispatcher state when dispatcher is disabled.
2010-10-27 19:31:24 -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
Dianne Hackborn
ea651a23e7
am aa93bcd6: Fix issue #3138926 : App\'s preferences can be lost after onPause()
2010-10-27 14:59:28 -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
Xavier Ducrohet
8d3420f18f
am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread
2010-10-27 11:23:58 -07:00
Xavier Ducrohet
069ba0b5f2
Merge "Fix issue with project resources overriding framework resources." into gingerbread
2010-10-27 11:22:22 -07:00
Yu Shan Emily Lau
dd5163d241
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:14:36 -07:00
Yu Shan Emily Lau
4ee95c7a3a
Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
2010-10-27 11:12:58 -07:00
Marco Nelissen
f391a980ed
am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread
2010-10-27 11:08:14 -07:00
Marco Nelissen
7be2f08762
Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread
2010-10-27 11:06:39 -07:00
Nick Pelly
f85e119944
am 6d55e134: Make best effort attempt to recover NFC service when it dies.
2010-10-27 10:43:19 -07:00
Andreas Huber
1f3d9f918d
am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
2010-10-26 16:23:54 -07:00
Andreas Huber
357f918ab6
Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
2010-10-26 16:21:48 -07:00
Justin Ho
21ebe2b8ee
am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
2010-10-26 16:08:13 -07:00
Justin Ho
73e5e53a3a
Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
2010-10-26 16:06:28 -07:00
Mathias Agopian
97e4998bff
am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
2010-10-26 12:22:12 -07:00
Mathias Agopian
c55197051d
am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
2010-10-26 12:19:48 -07:00
Mathias Agopian
3e98e38510
am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
2010-10-26 12:19:43 -07:00
Mathias Agopian
319b48d42a
Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
2010-10-26 12:18:32 -07:00
Mathias Agopian
d7f8a8d967
Merge "add format parameter to setBufferGeometry" into gingerbread
2010-10-26 12:18:19 -07:00
Mathias Agopian
2edb0ed093
Merge "fix eglChooseConfig() for special attributes." into gingerbread
2010-10-26 12:18:07 -07:00
Jeff Hamilton
bbab50ff23
am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
2010-10-26 12:16:10 -07:00
Jeff Hamilton
8709d74a96
Merge "Add a way to get a string for an error code." into gingerbread
2010-10-26 12:14:17 -07:00
Xavier Ducrohet
2232558582
am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
2010-10-26 12:10:28 -07:00
Xavier Ducrohet
a0afe4ee27
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
2010-10-26 12:09:18 -07:00
Justin Ho
8b46c7fea2
am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
2010-10-26 09:11:12 -07:00
Justin Ho
44f5078102
Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
2010-10-26 09:09:22 -07:00
Mike Lockwood
986ecf09ac
am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
2010-10-26 08:36:24 -07:00
Mike Lockwood
0404c45a79
Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
2010-10-26 08:34:32 -07:00
Eric Laurent
d75ac5a652
am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread
2010-10-26 08:14:48 -07:00
Eric Laurent
81396baafa
Merge "Partial fix for issue 3124895." into gingerbread
2010-10-26 08:13:32 -07:00
Jeff Hamilton
b24144b049
am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread
2010-10-26 07:24:57 -07:00
Joe Onorato
515c360b92
am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread
2010-10-26 07:24:41 -07:00
Jeff Hamilton
dbb47535b5
Merge "Make some contructors public but hidden." into gingerbread
2010-10-26 07:16:47 -07:00
Joe Onorato
69f8423ad9
Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread
2010-10-25 18:48:08 -07:00
Jean-Baptiste Queru
205e2b9bd2
Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
2010-10-25 17:28:29 -07:00
Jean-Baptiste Queru
5c8eb900ab
resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp
...
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
2010-10-25 17:27:16 -07:00
Scott Main
376fd3f8de
am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
...
Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp
* commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
update featured videos
2010-10-25 17:23:10 -07:00
Scott Main
3ab66217c8
am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
...
Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread
* commit 'c9ac1079696b93a294f504c6561397ef731a46f9':
update featured videos
2010-10-25 17:15:50 -07:00
Mathias Agopian
367dc0bd5f
Updade Surface (ANativeWindow) format based on its buffers format
...
this is to allow applications to change the format of a surface's
buffer, and have it reflected in EGL; which is needed for
EGLConfig validation.
Change-Id: Iee074c30ad765881e2409c1d37450b05e561c44d
2010-10-25 17:08:37 -07:00
Justin Ho
d6a3b3885f
am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
...
Merge commit '044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp
* commit '044df235c86ac69bb0e56cb4387e111ec276276e':
DO NOT MERGE - Updated ringtone assets for crespo
2010-10-25 16:50:34 -07:00
Justin Ho
a988e8dd60
Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
2010-10-25 16:44:01 -07:00
Gloria Wang
8fcb004423
Merge "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp
2010-10-25 16:39:12 -07:00
Joe Malin
a9c0f059d3
am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
...
Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp
* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
Doc Change: Revert NotePad sample test package
2010-10-25 16:22:46 -07:00
Eric Fischer
98e7c51115
am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp
* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
Import revised translations. DO NOT MERGE
2010-10-25 16:19:42 -07:00
Joe Malin
df6da5671f
Merge "Doc Change: Revert NotePad sample test package" into gingerbread
2010-10-25 16:19:18 -07:00
Eric Fischer
e8eb0f2551
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-25 16:14:47 -07:00
