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
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
Mathias Agopian
ea0b147ba5
am c724f2fb: disable the bypass mode. DO NOT MERGE.
...
* commit 'c724f2fba330da275f46586aeb5f0ae7bd2fae99':
disable the bypass mode. DO NOT MERGE.
2010-12-20 11:30:23 -08:00
Martijn Coenen
443a64841f
am ab82a5b9: Clean up and polish Mifare Classic tech.
...
* commit 'ab82a5b9a841cf052310e8500224932b9f5e3cad':
Clean up and polish Mifare Classic tech.
2010-12-20 11:30:12 -08:00
Dianne Hackborn
6a0809e21f
am c8e8a12b: Merge "Fix issue #3289835 : NullPointerException in..." into gingerbread
...
* commit 'c8e8a12b3c649bbaf610d2ff17bb10a7b32fe579':
Fix issue #3289835 : NullPointerException in...
2010-12-20 11:30:07 -08:00
Hung-ying Tyan
2a38c226dc
am a936b256: Remove SIP realm/domain check
...
* commit 'a936b256eb1611b5d8b88d0cd61f21225152cc82':
Remove SIP realm/domain check
2010-12-20 11:29:58 -08:00
Hung-ying Tyan
e28cca89d8
am acf64935: Merge "Check port in create peer\'s SIP profile." into gingerbread
...
* commit 'acf649356b1ab25098277018b5d76f55f9ef660b':
Check port in create peer's SIP profile.
2010-12-20 11:29:52 -08:00
Nick Pelly
39328e03d9
am 29f9ee97: Merge "Need to check ndef before writing ndef." into gingerbread
...
* commit '29f9ee973eefea3c68382ed38e69db1f1a396f3f':
Need to check ndef before writing ndef.
2010-12-20 11:29:40 -08:00
Scott Main
31c61873ff
am 0d1e38ef: cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
...
* commit '0d1e38ef99252cb14e6bcc4b3135021da025330f':
cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
2010-12-20 11:29:32 -08:00
Jamie Gennis
d07632d7b4
Merge "Change a Stagefright assert to an error check."
2010-12-20 10:22:48 -08:00
Glenn Kasten
2679d39ce5
Merge "Fix documentation errors"
2010-12-20 10:17:02 -08:00
Kristian Monsen
7415a13605
Merge "Send proxy changes on the webcore thread to WebKit"
2010-12-20 10:14:52 -08:00
Vasu Nori
9e61f72e28
Merge "if a download dir doesn't exist, create it or fail fast"
2010-12-20 09:20:18 -08:00
Kristian Monsen
de823a27c1
Merge "Remove WebView leak"
2010-12-20 06:04:51 -08:00
Adam Powell
47e538f759
Merge "Measure spinner items for sizing the dropdown view."
2010-12-19 16:20:06 -08:00
Svetoslav Ganov
141a0ef5f4
Merge "Bug 3292797. Talkback accessibility doesn't work at times."
2010-12-19 14:32:09 -08:00
Jim Miller
33eb36a976
Merge "Fix 3295530: Fix crash in RecentApps when we have no recents"
2010-12-19 01:49:33 -08:00
Mathias Agopian
902329fb3e
disable the bypass mode. DO NOT MERGE.
...
SF bypass mode triggers a bug in the display controller that
case cause the device to freeze.
Change-Id: If29b4d5132f463d13831b082b904c235f15a19fb
2010-12-18 03:45:26 -08:00
Adam Cohen
2c7cbb4348
Merge "Fixing leak in StackView"
2010-12-17 19:46:46 -08:00
Carl Shapiro
3d626c5543
Merge "Eliminate tracked allocations and the inNativeAlloc option."
2010-12-17 18:18:06 -08:00
Jim Miller
e51111b5c1
Merge "Fix 3148496: Update LockScreen clock to use new font."
2010-12-17 18:04:48 -08:00
Gilles Debunne
4c2430b54a
Merge "AutoLink identified spans are selected when long pressed."
2010-12-17 17:42:32 -08:00
Dianne Hackborn
f8776811e0
Merge "Some fixes to the new loader management."
2010-12-17 17:11:54 -08:00
Svetoslav Ganov
0defa3d961
Merge "Updating NumberPicker resources and DatePicker selector color for the Light Holo theme"
2010-12-17 16:41:17 -08:00
Svetoslav Ganov
a3c28cbf4b
Merge "Bug 3191746. atePicker TimePicker: Dark theme is used in a Light theme app"
2010-12-17 16:32:07 -08:00
Fred Quintana
d687248f2c
Merge "remove the hack to delay the accounts changed intent for the first account"
2010-12-17 16:10:33 -08:00
Adam Powell
313fd4d492
Merge "Tweak action bar show/hide animations"
2010-12-17 16:09:23 -08:00
Vasu Nori
c089cec4d7
Merge "bug:3286430 set default size of 100MB for download data dir"
2010-12-17 16:09:12 -08:00