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
Xavier Ducrohet
17220bc36a
am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair
...
Merge commit 'b847fbf2098acc8c5854bbbfa1453431128c720e' into eclair-plus-aosp
* commit 'b847fbf2098acc8c5854bbbfa1453431128c720e':
ADT/Layout: support for 3+ color in linear gradients
2010-01-14 17:20:04 -08:00
Roman Nurik
699cabccdc
Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair
2010-01-14 17:18:31 -08:00
Xavier Ducrohet
e6e89de8e8
Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair
2010-01-14 17:15:56 -08:00
John Wang
827d2d8067
am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair
...
Merge commit '99f2a4bb519e390eacc9807443c74ca05f176242' into eclair-plus-aosp
* commit '99f2a4bb519e390eacc9807443c74ca05f176242':
Add Event log for RAT switch.
2010-01-14 17:07:30 -08:00
John Wang
119d63dc7b
Merge "Add Event log for RAT switch." into eclair
2010-01-14 16:43:38 -08:00
Joe Onorato
95b7c51af8
am 836e1666: Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair
...
Merge commit '836e16666ec31dfe7559bcbe5710a97700c383f9' into eclair-plus-aosp
* commit '836e16666ec31dfe7559bcbe5710a97700c383f9':
add drawSpriteScreenspaceCropped to renderscript
2010-01-14 15:58:37 -08:00
Joe Onorato
e95e028590
Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair
2010-01-14 15:53:45 -08:00
Andreas Huber
39a759eb4d
Merge "Squashed commit of the following:"
2010-01-14 15:12:36 -08:00
Andreas Huber
6d69b6bc19
Merge "Fix a few issues with determining the closest sample to a given time in the MPEG4 sampletable implementation."
2010-01-14 15:12:29 -08:00
Ficus Kirkpatrick
ed82ee7bf2
Merge "Remove some settings we are no longer using."
2010-01-14 15:08:55 -08:00
Andreas Huber
0579c22dd5
Merge "Squashed commit of the following:"
2010-01-14 15:01:22 -08:00
Fred Quintana
b1eb51cebf
Merge "allow + in usernames"
2010-01-14 14:58:39 -08:00
Fred Quintana
ca99444c98
allow + in usernames
2010-01-14 14:57:20 -08:00
Andreas Huber
2a90d6fcd1
Merge "Workaround for some hardware decoders not properly signaling end-of-output-stream properly."
2010-01-14 14:50:11 -08:00
Suchi Amalapurapu
8a6fbfa1d5
Merge "app install on sdcard. provide skeleton implementation to install an app on sdcard, just resources. Add new install path for /asec in installd. ignore . when checking for apk path since the sdcard packages id'ed by package name. Add new -s option to adb shell pm Refactor fwd locked from scanMode to ApplicationInfo. Add new flag for sd install Add new parse flags for fwd locking and installing on sdcard New mock api's in PackageManagerService to invoke MountService api's. These will be refactored again and so have been wrapped internally. Some error codes in PackageManager Changes in PackageManagerService to use mPath and mScanPath during installation and switch to using PackageParser.Package.applicationInfo attributes for source and public resource directories. Some known issues that will be addressed later using system_uid for now. needs some tinkering with uid and packagesetting creation to use the actual app uid error handling from vold not very robust. ignoring lot of things for now sending a delayed destroy to delete packages. will revisit later revisit temp file creation later. just copy for now"
2010-01-14 14:01:56 -08:00
Nicolas Roard
6e307ef968
am 0123101a: am af2af4e5: Add proper support for fixed position elements
...
Merge commit '0123101af0e15221026f97f19dad23488840700a'
* commit '0123101af0e15221026f97f19dad23488840700a':
Add proper support for fixed position elements
2010-01-14 13:18:25 -08:00
Nicolas Roard
d685aabe01
am af2af4e5: Add proper support for fixed position elements
...
Merge commit 'af2af4e53aedb14c781d0351565fd7bec55a141a' into eclair-mr2-plus-aosp
* commit 'af2af4e53aedb14c781d0351565fd7bec55a141a':
Add proper support for fixed position elements
2010-01-14 13:13:26 -08:00
Scott Main
31b0321547
am 0409b1ba: Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair
...
Merge commit '0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb' into eclair-plus-aosp
* commit '0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb':
docs: remove dev guide link from download confirmation content
2010-01-14 13:05:46 -08:00