Dianne Hackborn
26ce184b06
Merge "Gah forgot this."
2010-12-21 19:21:41 -08:00
Dianne Hackborn
e11bf37bfa
Merge "Rework how recent tasks are added."
2010-12-21 19:07:38 -08:00
Hung-ying Tyan
aec78ca5a9
am e0bd2688: Merge "Check if VoIP API is supported in SipManager." into gingerbread
...
* commit 'e0bd2688ebc68402fb848efb5d307dba19c6a30c':
Check if VoIP API is supported in SipManager.
2010-12-21 18:36:55 -08:00
Hung-ying Tyan
6777b7fea3
Merge "Check if VoIP API is supported in SipManager." into gingerbread
2010-12-21 18:34:15 -08:00
Jeff Brown
a3bc59cceb
Merge "Add support for forward delete key."
2010-12-21 18:12:33 -08:00
Jeff Brown
33e6ad5652
Merge "Support invoking key shortcuts using Control."
2010-12-21 17:41:40 -08:00
Jake Hamby
8bb625cc23
Merge "Add EXTRA_LOCAL_ROLE to Pan State change intent."
2010-12-21 16:55:04 -08:00
Alex Sakhartchouk
f06688c341
Merge "API cleanup for renderscript. This will be a multiproject commit."
2010-12-21 16:51:52 -08:00
Gilles Debunne
40cb71c988
Merge "Links are clickable in TextView when textIsSelectable."
2010-12-21 16:10:20 -08:00
Robert Greenwalt
200af56501
am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
...
* commit '5d0fafe80752ad4e40fe0ec2bc06c43e669a0612':
Be sure and report NO_CONNECTIVITY when needed.
2010-12-21 16:06:19 -08:00
Robert Greenwalt
374504c059
Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
2010-12-21 16:02:13 -08:00
Andreas Huber
9edf1423b7
Merge "Better handling of forming absolute https URLs, runtime error on https:// access."
2010-12-21 14:51:44 -08:00
Amith Yamasani
9cec92d8ff
Merge "No frame and margins for dialog style preference screens."
2010-12-21 14:34:30 -08:00
Dianne Hackborn
23579789de
am 5261cea2: Merge "Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s." into gingerbread
...
* commit '5261cea2e0cd61801e102114039a19ab449b53fe':
Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s.
2010-12-21 13:33:06 -08:00
Dianne Hackborn
0c6568615a
Merge "Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s." into gingerbread
2010-12-21 13:27:15 -08:00
Xia Wang
7bd0bf36d9
Merge "Few changes for Wi-Fi Stress Test"
2010-12-21 13:13:42 -08:00
Jesse Wilson
3c5589a2f9
Merge "Remove unused performance tests."
2010-12-21 12:22:08 -08:00
Jean-Baptiste Queru
864530d1c6
am 749c627f: Merge "Support for KSC5601 on SIM."
...
* commit '749c627fc0f30dd3db051f22f20b69a51dc19e59':
Support for KSC5601 on SIM.
2010-12-21 12:05:04 -08:00
Dianne Hackborn
4f03c5d1a6
Merge "Fix issue #3301572 : onCreateLoader must not be a member class: VolumeMetadataLoader"
2010-12-21 11:15:39 -08:00
Xavier Ducrohet
02486c52c6
Merge "LayoutLib: Misc rendering fixes."
2010-12-21 10:48:29 -08:00
Xavier Ducrohet
456bbbe78d
Merge "LayoutLib: support for Path and BitmapShader using delegates."
2010-12-21 10:47:48 -08:00
Andreas Huber
5926d0efd9
Merge "Squashed commit of the following:"
2010-12-21 10:47:34 -08:00
James Dong
7c3db5fa7c
Merge "Add more debugging code to track down hang during video recording"
2010-12-21 10:47:17 -08:00
Jean-Baptiste Queru
decfba4df7
Merge "Support for KSC5601 on SIM."
2010-12-21 10:27:14 -08:00
Vasu Nori
bff5df168c
Merge "resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9"
2010-12-21 10:12:16 -08:00
Vasu Nori
11dde1100d
resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9
...
Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9 was reverted
due to a bug. fixed the bug and resubmitting it here
2010-12-21 09:32:36 -08:00
Patrick Dubroy
a76a804521
Merge "Ensure bitmaps aren't freed while referenced from a display list"
2010-12-20 17:15:31 -08:00
Huahui Wu
cab43805b4
Merge "Revert "Merge "Send proxy changes on the webcore thread to WebKit"""
2010-12-20 15:03:04 -08:00
Jason Sams
67f8dd80d6
Merge "Clean up Allocation buffer object api."
2010-12-20 14:28:52 -08:00
Vasu Nori
06acf68a75
Merge "Revert "bug:2448371 cursorwindow size moved to resource xml file.""
2010-12-20 14:24:48 -08:00
Vasu Nori
204249bcbe
Revert "bug:2448371 cursorwindow size moved to resource xml file."
...
This reverts commit 2594bae1f551d758c5c88771310d1ee3dc2c71ac.
2010-12-20 14:23:48 -08:00
Chet Haase
0409d8474a
Merge "Make sure background drawables are correct when View is attached"
2010-12-20 14:22:53 -08:00
Dianne Hackborn
626b3f86fa
Merge "More cleanup of Loader APIs."
2010-12-20 14:16:57 -08:00
Simon Wilson
19214876fb
am 0c8ad64d: Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread
...
* commit '0c8ad64d64b23e2bdd62bc217e327c7e0583784b':
fix [3127755] Launcher is missing anti-aliasing
2010-12-20 14:11:46 -08:00
Simon Wilson
c6a0991635
Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread
2010-12-20 14:09:52 -08:00
Vasu Nori
6da7586cfa
Merge "bug:2448371 cursorwindow size moved to resource xml file."
2010-12-20 13:10:26 -08:00
Vasu Nori
bd57473e90
bug:2448371 cursorwindow size moved to resource xml file.
...
let cursor window size be set per device in device resources file.
default is 1MB.
for SR, it is 2MB.
it can be set to any value (in kB) in the device resource
strings.xml file
Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9
2010-12-20 13:08:08 -08:00
James Dong
6d2e96bd22
Merge "Backward-compatibility max file size support, ignoring 0 or negative file size limit"
2010-12-20 12:00:52 -08:00
Mike LeBeau
a3418efacf
am 0655b31d: am 12b82c8d: Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn\'t want to make it public then because it wasn\'t until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread
...
* commit '0655b31d758ce8fe054c98c6d288e424f2d273e2':
Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app.
2010-12-20 12:00:06 -08:00
Mike LeBeau
ee966f6ead
am 12b82c8d: Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn\'t want to make it public then because it wasn\'t until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread
...
* commit '12b82c8da7bc477e591b12d8b7e469a9ba6dd574':
Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app.
2010-12-20 11:58:01 -08:00
Mike LeBeau
98cb0d3f0f
Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread
2010-12-20 11:55:56 -08:00
Scott Main
e5eeab242b
am e1df8e9b: am 00410256: cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
...
* commit 'e1df8e9be8e3a9969cf0d3594946abe0aa410c1e':
cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
2010-12-20 11:33:41 -08:00
Mathias Agopian
19f20c58b6
am d8a98cf0: (-s ours) am c724f2fb: disable the bypass mode. DO NOT MERGE.
...
* commit 'd8a98cf0a30dbb95ea2fcc8dfe2fe37d670d243e':
disable the bypass mode. DO NOT MERGE.
2010-12-20 11:33:37 -08:00
Martijn Coenen
31eead37e6
am 07249236: am ab82a5b9: Clean up and polish Mifare Classic tech.
...
* commit '07249236fcef7ef0603b9978ec3b420f247b51cb':
Clean up and polish Mifare Classic tech.
2010-12-20 11:33:32 -08:00
Dianne Hackborn
2b0c5513c5
am d485c76b: am c8e8a12b: Merge "Fix issue #3289835 : NullPointerException in..." into gingerbread
...
* commit 'd485c76b5e09a8c311f8f129cbe5ec75499556be':
Fix issue #3289835 : NullPointerException in...
2010-12-20 11:33:27 -08:00
Hung-ying Tyan
4c2689d92a
am d90bc225: am a936b256: Remove SIP realm/domain check
...
* commit 'd90bc225b9d6e4f8f69d984aa63062a7b20ac65c':
Remove SIP realm/domain check
2010-12-20 11:33:23 -08:00
Hung-ying Tyan
0effe8fed5
am 87792491: am acf64935: Merge "Check port in create peer\'s SIP profile." into gingerbread
...
* commit '877924912abd4c368597ca11c732af6623208c6b':
Check port in create peer's SIP profile.
2010-12-20 11:33:18 -08:00
Nick Pelly
6b2cc1b0dd
am 623baf8e: am 29f9ee97: Merge "Need to check ndef before writing ndef." into gingerbread
...
* commit '623baf8edb5301ee412a428a5b25ea38d7b39f91':
Need to check ndef before writing ndef.
2010-12-20 11:33:13 -08:00
Scott Main
32fc4074bc
am cdd76cf5: am 0d1e38ef: cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
...
* commit 'cdd76cf5873ee709d04ffeda6e56c5f15bfa1bba':
cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
2010-12-20 11:33:04 -08:00
Scott Main
76d4f2bb1b
am 00410256: cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
...
* commit '00410256a667866b0b9d12b513688d3894140b73':
cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
2010-12-20 11:30:35 -08:00