Andreas Huber
b928563093
Merge "Remove totally unused code from OMX.cpp"
2010-01-19 10:50:54 -08:00
Bjorn Bringert
65316a1901
Merge "Fix WEB_SEARCH handler whitelist"
2010-01-19 10:47:30 -08:00
Andreas Huber
5a05fa1575
Merge "Upgrade for the stagefright commandline tool to support extracting thumbnails and to optionally prefer software codecs."
2010-01-19 10:25:13 -08:00
Andreas Huber
577fa59f00
Merge "Make sure the seek test attempts to seek on the very first iteration, as this appears to be a special case that decoders frequently get wrong."
2010-01-19 10:24:58 -08:00
Bjorn Bringert
46b6bc7c21
Merge "Make SearchManager.getGlobalSearchActivity() public but hidden"
2010-01-19 00:58:39 -08:00
Xavier Ducrohet
2a5636e3fc
am 1da2735c: am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair
...
Merge commit '1da2735c5862d48712706c2052a34e10e3dea43b'
* commit '1da2735c5862d48712706c2052a34e10e3dea43b':
ADT/Layoutlib: implement Canvas.concat(Matrix)
2010-01-19 00:02:15 -08:00
Adam Powell
a0a7b07365
am b5a5a397: am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair
...
Merge commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee'
* commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee':
TransformGestureDetector is now ScaleGestureDetector - scope reduced.
2010-01-19 00:02:00 -08:00
Xavier Ducrohet
fd1a7126a8
am cff6c845: am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactory
...
Merge commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c'
* commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c':
ADT/Layoutlib: Reimplement parts of BitmapFactory
2010-01-19 00:01:32 -08:00
Grace Kloba
aa09eba872
am f167c4bf: DO NOT MERGE
...
Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp
* commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3':
DO NOT MERGE
2010-01-18 23:43:37 -08:00
Grace Kloba
fb5587efa1
am 17b14bd3: DO NOT MERGE
...
Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp
* commit '17b14bd36aba265ac6bffc2626d8db29713d7c45':
DO NOT MERGE
2010-01-18 23:43:32 -08:00
Grace Kloba
b8d4b14257
am 5a0bf1f0: DO NOT MERGE
...
Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp
* commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7':
DO NOT MERGE
2010-01-18 23:43:27 -08:00
Grace Kloba
7bd3a10bca
am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
...
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp
* commit 'd79d1c72991e587294432e80d091e3ae26a0c103':
If ZoomButttonsController detects more than one pointer,
2010-01-18 23:43:20 -08:00
Grace Kloba
12813fd3b7
am f080a5ad: Merge "DO NOT MERGE" into eclair
...
Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp
* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
DO NOT MERGE
2010-01-18 23:43:14 -08:00
Jim Miller
3665ec2e86
am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
...
Merge commit '813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp
* commit '813d2d86789d1c2e705c4d11d052ad649e6bac84':
Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
2010-01-18 23:43:01 -08:00
Xavier Ducrohet
cdbcb8441a
am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
...
Merge commit '908a81119061092468067789acbec9b99d79ad5f' into eclair-plus-aosp
* commit '908a81119061092468067789acbec9b99d79ad5f':
ADT/Layoutlib: Add dash support to stroke.
2010-01-18 23:42:55 -08:00
Xavier Ducrohet
7dbb68e405
am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair
...
Merge commit '2b30a4a50e24080fdd8b796e4a64447f223d4522' into eclair-plus-aosp
* commit '2b30a4a50e24080fdd8b796e4a64447f223d4522':
ADT/Layoutlib: properly handle stroke information.
2010-01-18 23:42:28 -08:00
Grace Kloba
90f5995ffd
Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
2010-01-18 15:21:38 -08:00
Grace Kloba
d0e837b13a
Merge "DO NOT MERGE" into eclair
2010-01-18 15:21:31 -08:00
San Mehat
49ef2b6c98
Merge "MountService: Add new 'unmountSecureContainer' API call"
2010-01-18 07:14:02 -08:00
Daisuke Miyakawa
00fe42ba50
Merge "Make vCard importer support lower case params."
2010-01-17 15:32:02 -08:00
Oscar Montemayor
a507b8d27e
Merge "Apps on SD card. Added support for retrieving and generating keys as Hex Strings. Using keys to mount encrypted FS."
2010-01-15 19:03:32 -08:00
Jim Miller
02e8622ef1
Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
2010-01-15 17:20:29 -08:00
Romain Guy
26d048678b
Merge "Added a method for spatial sampling."
2010-01-15 16:44:49 -08:00
San Mehat
ca696e0841
Merge "sdutil: Use new MountService api method names"
2010-01-15 16:30:05 -08:00
Oscar Montemayor
fa8756149a
Merge "Apps on SD card. Added support for retrieving and generating keys as Hex Strings. Using keys to mount encrypted FS."
2010-01-15 16:20:23 -08:00
Kenny Root
5408f1409b
Merge "Update Time.parse3339() unit tests"
2010-01-15 14:44:58 -08:00
Romain Guy
f450dc86a4
Merge "Added clone to these three classes and added more comments."
2010-01-15 14:40:48 -08:00
Romain Guy
6b0221b52b
Merge "Added non-uniform scaling for spatial sampling."
2010-01-15 14:31:34 -08:00
Xavier Ducrohet
7dfc1deefe
Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
2010-01-15 14:27:34 -08:00
Colin Cross
1410dff104
Merge "Use correct TLS codepath in graphics libraries"
2010-01-15 14:07:32 -08:00
Oscar Montemayor
d43a216f76
Merge "Apps on SD card. Added support for retrieving and generating keys as Hex Strings."
2010-01-15 13:52:39 -08:00
Eric Fischer
fcebabb49f
Merge "Make the "AM" or "PM" in the status bar clock be in a smaller font size."
2010-01-15 11:23:00 -08:00
Vasu Nori
2ecee422a8
Merge "Change Log.wtf() call to Log.w()"
2010-01-15 10:51:25 -08:00
Niko Catania
db2c8a7b61
Merge "New method to return the last dialed number Bug:2227429"
2010-01-15 10:47:48 -08:00
Robert Greenwalt
bc9cde22d6
resolved conflicts for merge of 90528645 to master
2010-01-15 10:45:11 -08:00
Xavier Ducrohet
783eade582
Merge "ADT/Layoutlib: properly handle stroke information." into eclair
2010-01-15 10:30:52 -08:00
Robert Greenwalt
01389e2945
Merge "Set net.hostname sys property to our unique ID."
2010-01-15 10:20:18 -08:00
Niko Catania
10cdb3417f
Merge "New method to return the last dialed number Bug:2227429"
2010-01-15 09:18:05 -08:00
Tom O'Neill
6f30a0f40e
Merge "Improve ContractsContract.RawContacts documentation"
2010-01-15 08:15:20 -08:00
Grace Kloba
9e29d82925
am 4d69ac66: Merge "DO NOT MERGE" into eclair
...
Merge commit '4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp
* commit '4d69ac6695246b8df06a6583044dc4712d81a956':
DO NOT MERGE
2010-01-14 19:32:45 -08:00
Grace Kloba
ee697f3571
am d1019a99: Merge "DO NOT MERGE" into eclair
...
Merge commit 'd1019a99f9b458a4129e047c96de7192a61e5e99' into eclair-plus-aosp
* commit 'd1019a99f9b458a4129e047c96de7192a61e5e99':
DO NOT MERGE
2010-01-14 19:32:39 -08:00
Grace Kloba
b1796e407e
Merge "DO NOT MERGE" into eclair
2010-01-14 19:29:09 -08:00
Grace Kloba
33f00cc68c
Merge "DO NOT MERGE" into eclair
2010-01-14 19:28:55 -08:00
Xavier Ducrohet
bb1ea13390
am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair
...
Merge commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5' into eclair-plus-aosp
* commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5':
ADT/Layoutlib: improved gradient drawing for perf.
2010-01-14 19:15:28 -08:00
Xavier Ducrohet
98f1cfc214
am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that.
...
Merge commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be' into eclair-plus-aosp
* commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be':
ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
2010-01-14 19:15:22 -08:00
Xavier Ducrohet
bff9299731
Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair
2010-01-14 19:10:44 -08:00
Romain Guy
ae6d574c61
Merge "Added non-uniform scaling for spatial sampling and converted double to float."
2010-01-14 18:43:51 -08:00
Xavier Ducrohet
73bd84a35f
am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair
...
Merge commit '240298f9e4542c487edd0337e84b50c493cbeecd' into eclair-plus-aosp
* commit '240298f9e4542c487edd0337e84b50c493cbeecd':
ADT/Layoutlib: always use custom gradient (java) Paint.
2010-01-14 18:39:48 -08:00
Xavier Ducrohet
03d8ad606d
Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair
2010-01-14 18:36:26 -08:00
Roman Nurik
fb8bbefbb2
am 6a739ea8: Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair
...
Merge commit '6a739ea88d33f901172d60b0de0f442f2dc485cc' into eclair-plus-aosp
* commit '6a739ea88d33f901172d60b0de0f442f2dc485cc':
Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
2010-01-14 17:20:09 -08:00