Leon Scroggins
a61c53dfe5
am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread
...
* commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
Update insertion handler for WebTextView.
2010-11-01 14:51:00 -07:00
Leon Scroggins
fd2ddb4c43
Merge "Update insertion handler for WebTextView." into gingerbread
2010-11-01 14:49:47 -07:00
Jean-Baptiste Queru
39fc718490
am 5b4d0e84: Merge "TabWidget orientation"
...
* commit '5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
TabWidget orientation
2010-11-01 13:30:49 -07:00
Jean-Baptiste Queru
86b2b99f9d
Merge "TabWidget orientation"
2010-11-01 13:19:02 -07:00
Dianne Hackborn
cc3af429d8
am 42679cea: Merge "Fix issue #3152415 : Various confusions in docs about Application" into gingerbread
...
* commit '42679cea5d8bc4b235b290b97805b86c8c7cbca5':
Fix issue #3152415 : Various confusions in docs about Application
2010-11-01 12:49:51 -07:00
Dianne Hackborn
2ee26e2cf4
Merge "Fix issue #3152415 : Various confusions in docs about Application" into gingerbread
2010-11-01 12:47:02 -07:00
Jean-Baptiste Queru
4188d55474
am b6db2d51: Merge "Bluetooth OBEX timeout problem."
...
* commit 'b6db2d5125511284ee0962dd85d9be0099e51b22':
Bluetooth OBEX timeout problem.
2010-11-01 10:53:09 -07:00
Jean-Baptiste Queru
d37761cfd9
Merge "Bluetooth OBEX timeout problem."
2010-11-01 10:46:36 -07:00
Jean-Baptiste Queru
1cf05e8506
am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database ( http://code.google.com/p/android/issues/detail?id=7907 )."
...
* commit 'b1fa549a49fd8fa2fe67ee30d107cc2d1486645f':
Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907 ).
2010-11-01 10:39:01 -07:00
Jean-Baptiste Queru
24574f1312
Merge "Fixes Issue 7907 in the public bugs database ( http://code.google.com/p/android/issues/detail?id=7907 )."
2010-11-01 10:29:22 -07:00
Romain Guy
bcd52db16e
am cee8d1d3: Merge "fix typo"
...
* commit 'cee8d1d3450fb2b7490fbe41bf8b3f974c015f6f':
fix typo
2010-10-31 11:21:24 -07:00
Romain Guy
a290bb6aba
Merge "fix typo"
2010-10-31 11:12:51 -07:00
Dianne Hackborn
35cd3521e2
am 70a2c15e: Final SDK API 9. DO NOT MERGE.
...
* commit '70a2c15ecfd4e8cd8581699d5df8a219c7d5cdb1':
Final SDK API 9. DO NOT MERGE.
2010-10-29 19:03:03 -07:00
Scott Main
d0af840115
am 38fd3948: am 579db096: docs: remove another "new" tag
...
* commit '38fd394815a992c8874f73389e8ca849782e5fcd':
docs: remove another "new" tag
2010-10-29 17:21:07 -07:00
Scott Main
33f2f39576
am 579db096: docs: remove another "new" tag
...
* commit '579db096fa05bd077fadb04876ecf99e3ccd02b9':
docs: remove another "new" tag
2010-10-29 17:16:57 -07:00
Neal Nguyen
8154016625
am 06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
...
* commit '06875afad6101892a735f79aeb2c7bdbb58c26fa':
A little tweaking of DL Manager tests and adding better debugging output.
2010-10-29 17:10:12 -07:00
Neal Nguyen
e24b6ae868
Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
2010-10-29 17:07:59 -07:00
Scott Main
2ebd346aa4
am 6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
...
* commit '6e8d6bd09facabcc0f868960e6453b8f79cd9136':
docs: Update various SDK docs for GB platform and tools
2010-10-29 15:37:17 -07:00
Scott Main
53c33985c6
Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
2010-10-29 15:34:00 -07:00
Leon Clarke
3f14260637
am 5ccbe059: DO NOT MERGE. Add assets for <select>
...
* commit '5ccbe05945325dc77d543d44b69a7f80196d8cb9':
DO NOT MERGE. Add assets for <select>
2010-10-29 14:49:07 -07:00
Scott Main
8ad94714bf
am 1112632a: Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
...
* commit '1112632a41462c5dd34c7af9f67b88188a520517':
docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs
2010-10-29 10:24:04 -07:00
Scott Main
067ed47405
Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
2010-10-29 10:03:36 -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
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
Nick Pelly
16ebd362fe
Merge "Hide some NFC API's." into gingerbread
2010-10-28 16:47:31 -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
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
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
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
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
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
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
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