OSDN Git Service
Hung-ying Tyan [Wed, 22 Dec 2010 19:35:14 +0000 (11:35 -0800)]
am
aec9a33f: am
e0bd2688: Merge "Check if VoIP API is supported in SipManager." into gingerbread
* commit '
aec9a33f1cfc7c32690bc8e24aefaeb137ab9859':
Check if VoIP API is supported in SipManager.
Robert Greenwalt [Wed, 22 Dec 2010 19:35:06 +0000 (11:35 -0800)]
am
46f98746: am
5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
* commit '
46f987465c1df4ec984e725747d4d79fc592abb7':
Be sure and report NO_CONNECTIVITY when needed.
Dianne Hackborn [Wed, 22 Dec 2010 19:34:59 +0000 (11:34 -0800)]
am
20c915d8: am
5261cea2: Merge "Fix issue #
3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread
* commit '
20c915d80356859d8716f014a7d4950f06c38cfc':
Fix issue #
3224616: TimeUtils.formatDuration() can drop 0s.
Jean-Baptiste Queru [Wed, 22 Dec 2010 19:34:50 +0000 (11:34 -0800)]
am
b3177c13: (-s ours) am
749c627f: Merge "Support for KSC5601 on SIM."
* commit '
b3177c135bb7a3db3318893335a9ac0bc39d9cf8':
Support for KSC5601 on SIM.
Simon Wilson [Wed, 22 Dec 2010 19:29:07 +0000 (11:29 -0800)]
am
490db31b: (-s ours) am
0c8ad64d: Merge "fix [
3127755] Launcher is missing anti-aliasing" into gingerbread
* commit '
490db31b851af9195f8f5bd4c5b21f59be56b207':
fix [
3127755] Launcher is missing anti-aliasing
Andreas Huber [Wed, 22 Dec 2010 18:17:03 +0000 (10:17 -0800)]
Merge "Distinguish discontinuities w/ a format change from those without."
Ben Murdoch [Wed, 22 Dec 2010 17:04:02 +0000 (09:04 -0800)]
Merge "Create a better placeholder for YT videos when flash is not installed."
Chet Haase [Wed, 22 Dec 2010 15:12:24 +0000 (07:12 -0800)]
Merge "Account for background drawable size changing when lrtb properties change"
Dianne Hackborn [Wed, 22 Dec 2010 07:24:50 +0000 (23:24 -0800)]
Merge "Fix issue #
3263026: Screen rotation animation is funky..."
satok [Wed, 22 Dec 2010 07:09:38 +0000 (23:09 -0800)]
Merge "Fix NPE when the shortcut subtype was not found."
Dianne Hackborn [Wed, 22 Dec 2010 03:21:41 +0000 (19:21 -0800)]
Merge "Gah forgot this."
Dianne Hackborn [Wed, 22 Dec 2010 03:07:38 +0000 (19:07 -0800)]
Merge "Rework how recent tasks are added."
Hung-ying Tyan [Wed, 22 Dec 2010 02:36:55 +0000 (18:36 -0800)]
am
e0bd2688: Merge "Check if VoIP API is supported in SipManager." into gingerbread
* commit '
e0bd2688ebc68402fb848efb5d307dba19c6a30c':
Check if VoIP API is supported in SipManager.
Hung-ying Tyan [Wed, 22 Dec 2010 02:34:15 +0000 (18:34 -0800)]
Merge "Check if VoIP API is supported in SipManager." into gingerbread
Jeff Brown [Wed, 22 Dec 2010 02:12:33 +0000 (18:12 -0800)]
Merge "Add support for forward delete key."
Jeff Brown [Wed, 22 Dec 2010 01:41:40 +0000 (17:41 -0800)]
Merge "Support invoking key shortcuts using Control."
Jake Hamby [Wed, 22 Dec 2010 00:55:04 +0000 (16:55 -0800)]
Merge "Add EXTRA_LOCAL_ROLE to Pan State change intent."
Alex Sakhartchouk [Wed, 22 Dec 2010 00:51:52 +0000 (16:51 -0800)]
Merge "API cleanup for renderscript. This will be a multiproject commit."
Gilles Debunne [Wed, 22 Dec 2010 00:10:20 +0000 (16:10 -0800)]
Merge "Links are clickable in TextView when textIsSelectable."
Robert Greenwalt [Wed, 22 Dec 2010 00:06:19 +0000 (16:06 -0800)]
am
5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
* commit '
5d0fafe80752ad4e40fe0ec2bc06c43e669a0612':
Be sure and report NO_CONNECTIVITY when needed.
Robert Greenwalt [Wed, 22 Dec 2010 00:02:13 +0000 (16:02 -0800)]
Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
Andreas Huber [Tue, 21 Dec 2010 22:51:44 +0000 (14:51 -0800)]
Merge "Better handling of forming absolute https URLs, runtime error on https:// access."
Amith Yamasani [Tue, 21 Dec 2010 22:34:30 +0000 (14:34 -0800)]
Merge "No frame and margins for dialog style preference screens."
Dianne Hackborn [Tue, 21 Dec 2010 21:33:06 +0000 (13:33 -0800)]
am
5261cea2: Merge "Fix issue #
3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread
* commit '
5261cea2e0cd61801e102114039a19ab449b53fe':
Fix issue #
3224616: TimeUtils.formatDuration() can drop 0s.
Dianne Hackborn [Tue, 21 Dec 2010 21:27:15 +0000 (13:27 -0800)]
Merge "Fix issue #
3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread
Xia Wang [Tue, 21 Dec 2010 21:13:42 +0000 (13:13 -0800)]
Merge "Few changes for Wi-Fi Stress Test"
Jesse Wilson [Tue, 21 Dec 2010 20:22:08 +0000 (12:22 -0800)]
Merge "Remove unused performance tests."
Jean-Baptiste Queru [Tue, 21 Dec 2010 20:05:04 +0000 (12:05 -0800)]
am
749c627f: Merge "Support for KSC5601 on SIM."
* commit '
749c627fc0f30dd3db051f22f20b69a51dc19e59':
Support for KSC5601 on SIM.
Dianne Hackborn [Tue, 21 Dec 2010 19:15:39 +0000 (11:15 -0800)]
Merge "Fix issue #
3301572: onCreateLoader must not be a member class: VolumeMetadataLoader"
Xavier Ducrohet [Tue, 21 Dec 2010 18:48:29 +0000 (10:48 -0800)]
Merge "LayoutLib: Misc rendering fixes."
Xavier Ducrohet [Tue, 21 Dec 2010 18:47:48 +0000 (10:47 -0800)]
Merge "LayoutLib: support for Path and BitmapShader using delegates."
Andreas Huber [Tue, 21 Dec 2010 18:47:34 +0000 (10:47 -0800)]
Merge "Squashed commit of the following:"
James Dong [Tue, 21 Dec 2010 18:47:17 +0000 (10:47 -0800)]
Merge "Add more debugging code to track down hang during video recording"
Jean-Baptiste Queru [Tue, 21 Dec 2010 18:27:14 +0000 (10:27 -0800)]
Merge "Support for KSC5601 on SIM."
Vasu Nori [Tue, 21 Dec 2010 18:12:16 +0000 (10:12 -0800)]
Merge "resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9"
Vasu Nori [Tue, 21 Dec 2010 17:32:36 +0000 (09:32 -0800)]
resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9
Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9 was reverted
due to a bug. fixed the bug and resubmitting it here
Patrick Dubroy [Tue, 21 Dec 2010 01:15:31 +0000 (17:15 -0800)]
Merge "Ensure bitmaps aren't freed while referenced from a display list"
Huahui Wu [Mon, 20 Dec 2010 23:03:04 +0000 (15:03 -0800)]
Merge "Revert "Merge "Send proxy changes on the webcore thread to WebKit"""
Jason Sams [Mon, 20 Dec 2010 22:28:52 +0000 (14:28 -0800)]
Merge "Clean up Allocation buffer object api."
Vasu Nori [Mon, 20 Dec 2010 22:24:48 +0000 (14:24 -0800)]
Merge "Revert "bug:
2448371 cursorwindow size moved to resource xml file.""
Vasu Nori [Mon, 20 Dec 2010 22:23:48 +0000 (14:23 -0800)]
Revert "bug:
2448371 cursorwindow size moved to resource xml file."
This reverts commit
2594bae1f551d758c5c88771310d1ee3dc2c71ac.
Chet Haase [Mon, 20 Dec 2010 22:22:53 +0000 (14:22 -0800)]
Merge "Make sure background drawables are correct when View is attached"
Dianne Hackborn [Mon, 20 Dec 2010 22:16:57 +0000 (14:16 -0800)]
Merge "More cleanup of Loader APIs."
Simon Wilson [Mon, 20 Dec 2010 22:11:46 +0000 (14:11 -0800)]
am
0c8ad64d: Merge "fix [
3127755] Launcher is missing anti-aliasing" into gingerbread
* commit '
0c8ad64d64b23e2bdd62bc217e327c7e0583784b':
fix [
3127755] Launcher is missing anti-aliasing
Simon Wilson [Mon, 20 Dec 2010 22:09:52 +0000 (14:09 -0800)]
Merge "fix [
3127755] Launcher is missing anti-aliasing" into gingerbread
Vasu Nori [Mon, 20 Dec 2010 21:10:26 +0000 (13:10 -0800)]
Merge "bug:
2448371 cursorwindow size moved to resource xml file."
Vasu Nori [Sun, 19 Dec 2010 08:21:10 +0000 (00:21 -0800)]
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
James Dong [Mon, 20 Dec 2010 20:00:52 +0000 (12:00 -0800)]
Merge "Backward-compatibility max file size support, ignoring 0 or negative file size limit"
Mike LeBeau [Mon, 20 Dec 2010 20:00:06 +0000 (12:00 -0800)]
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.
Mike LeBeau [Mon, 20 Dec 2010 19:58:01 +0000 (11:58 -0800)]
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.
Mike LeBeau [Mon, 20 Dec 2010 19:55:56 +0000 (11:55 -0800)]
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
Scott Main [Mon, 20 Dec 2010 19:33:41 +0000 (11:33 -0800)]
am
e1df8e9b: am
00410256: cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
* commit '
e1df8e9be8e3a9969cf0d3594946abe0aa410c1e':
cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
Mathias Agopian [Mon, 20 Dec 2010 19:33:37 +0000 (11:33 -0800)]
am
d8a98cf0: (-s ours) am
c724f2fb: disable the bypass mode. DO NOT MERGE.
* commit '
d8a98cf0a30dbb95ea2fcc8dfe2fe37d670d243e':
disable the bypass mode. DO NOT MERGE.
Martijn Coenen [Mon, 20 Dec 2010 19:33:32 +0000 (11:33 -0800)]
am
07249236: am
ab82a5b9: Clean up and polish Mifare Classic tech.
* commit '
07249236fcef7ef0603b9978ec3b420f247b51cb':
Clean up and polish Mifare Classic tech.
Dianne Hackborn [Mon, 20 Dec 2010 19:33:27 +0000 (11:33 -0800)]
am
d485c76b: am
c8e8a12b: Merge "Fix issue #
3289835: NullPointerException in..." into gingerbread
* commit '
d485c76b5e09a8c311f8f129cbe5ec75499556be':
Fix issue #
3289835: NullPointerException in...
Hung-ying Tyan [Mon, 20 Dec 2010 19:33:23 +0000 (11:33 -0800)]
am
d90bc225: am
a936b256: Remove SIP realm/domain check
* commit '
d90bc225b9d6e4f8f69d984aa63062a7b20ac65c':
Remove SIP realm/domain check
Hung-ying Tyan [Mon, 20 Dec 2010 19:33:18 +0000 (11:33 -0800)]
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.
Nick Pelly [Mon, 20 Dec 2010 19:33:13 +0000 (11:33 -0800)]
am
623baf8e: am
29f9ee97: Merge "Need to check ndef before writing ndef." into gingerbread
* commit '
623baf8edb5301ee412a428a5b25ea38d7b39f91':
Need to check ndef before writing ndef.
Scott Main [Mon, 20 Dec 2010 19:33:04 +0000 (11:33 -0800)]
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
Scott Main [Mon, 20 Dec 2010 19:30:35 +0000 (11:30 -0800)]
am
00410256: cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
* commit '
00410256a667866b0b9d12b513688d3894140b73':
cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
Mathias Agopian [Mon, 20 Dec 2010 19:30:23 +0000 (11:30 -0800)]
am
c724f2fb: disable the bypass mode. DO NOT MERGE.
* commit '
c724f2fba330da275f46586aeb5f0ae7bd2fae99':
disable the bypass mode. DO NOT MERGE.
Martijn Coenen [Mon, 20 Dec 2010 19:30:12 +0000 (11:30 -0800)]
am
ab82a5b9: Clean up and polish Mifare Classic tech.
* commit '
ab82a5b9a841cf052310e8500224932b9f5e3cad':
Clean up and polish Mifare Classic tech.
Dianne Hackborn [Mon, 20 Dec 2010 19:30:07 +0000 (11:30 -0800)]
am
c8e8a12b: Merge "Fix issue #
3289835: NullPointerException in..." into gingerbread
* commit '
c8e8a12b3c649bbaf610d2ff17bb10a7b32fe579':
Fix issue #
3289835: NullPointerException in...
Hung-ying Tyan [Mon, 20 Dec 2010 19:29:58 +0000 (11:29 -0800)]
am
a936b256: Remove SIP realm/domain check
* commit '
a936b256eb1611b5d8b88d0cd61f21225152cc82':
Remove SIP realm/domain check
Hung-ying Tyan [Mon, 20 Dec 2010 19:29:52 +0000 (11:29 -0800)]
am
acf64935: Merge "Check port in create peer\'s SIP profile." into gingerbread
* commit '
acf649356b1ab25098277018b5d76f55f9ef660b':
Check port in create peer's SIP profile.
Nick Pelly [Mon, 20 Dec 2010 19:29:40 +0000 (11:29 -0800)]
am
29f9ee97: Merge "Need to check ndef before writing ndef." into gingerbread
* commit '
29f9ee973eefea3c68382ed38e69db1f1a396f3f':
Need to check ndef before writing ndef.
Scott Main [Mon, 20 Dec 2010 19:29:32 +0000 (11:29 -0800)]
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
Jamie Gennis [Mon, 20 Dec 2010 18:22:48 +0000 (10:22 -0800)]
Merge "Change a Stagefright assert to an error check."
Glenn Kasten [Mon, 20 Dec 2010 18:17:02 +0000 (10:17 -0800)]
Merge "Fix documentation errors"
Kristian Monsen [Mon, 20 Dec 2010 18:14:52 +0000 (10:14 -0800)]
Merge "Send proxy changes on the webcore thread to WebKit"
Vasu Nori [Mon, 20 Dec 2010 17:20:18 +0000 (09:20 -0800)]
Merge "if a download dir doesn't exist, create it or fail fast"
Kristian Monsen [Mon, 20 Dec 2010 14:04:51 +0000 (06:04 -0800)]
Merge "Remove WebView leak"
Adam Powell [Mon, 20 Dec 2010 00:20:06 +0000 (16:20 -0800)]
Merge "Measure spinner items for sizing the dropdown view."
Svetoslav Ganov [Sun, 19 Dec 2010 22:32:09 +0000 (14:32 -0800)]
Merge "Bug
3292797. Talkback accessibility doesn't work at times."
Jim Miller [Sun, 19 Dec 2010 09:49:33 +0000 (01:49 -0800)]
Merge "Fix
3295530: Fix crash in RecentApps when we have no recents"
Mathias Agopian [Sat, 18 Dec 2010 11:35:05 +0000 (03:35 -0800)]
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
Adam Cohen [Sat, 18 Dec 2010 03:46:46 +0000 (19:46 -0800)]
Merge "Fixing leak in StackView"
Carl Shapiro [Sat, 18 Dec 2010 02:18:06 +0000 (18:18 -0800)]
Merge "Eliminate tracked allocations and the inNativeAlloc option."
Jim Miller [Sat, 18 Dec 2010 02:04:48 +0000 (18:04 -0800)]
Merge "Fix
3148496: Update LockScreen clock to use new font."
Gilles Debunne [Sat, 18 Dec 2010 01:42:32 +0000 (17:42 -0800)]
Merge "AutoLink identified spans are selected when long pressed."
Dianne Hackborn [Sat, 18 Dec 2010 01:11:54 +0000 (17:11 -0800)]
Merge "Some fixes to the new loader management."
Svetoslav Ganov [Sat, 18 Dec 2010 00:41:17 +0000 (16:41 -0800)]
Merge "Updating NumberPicker resources and DatePicker selector color for the Light Holo theme"
Svetoslav Ganov [Sat, 18 Dec 2010 00:32:07 +0000 (16:32 -0800)]
Merge "Bug
3191746. atePicker TimePicker: Dark theme is used in a Light theme app"
Fred Quintana [Sat, 18 Dec 2010 00:10:33 +0000 (16:10 -0800)]
Merge "remove the hack to delay the accounts changed intent for the first account"
Adam Powell [Sat, 18 Dec 2010 00:09:23 +0000 (16:09 -0800)]
Merge "Tweak action bar show/hide animations"
Vasu Nori [Sat, 18 Dec 2010 00:09:12 +0000 (16:09 -0800)]
Merge "bug:
3286430 set default size of 100MB for download data dir"
Amith Yamasani [Sat, 18 Dec 2010 00:01:05 +0000 (16:01 -0800)]
Merge "Move the margins to the left pane in the preference panel."
Gilles Debunne [Fri, 17 Dec 2010 23:48:43 +0000 (15:48 -0800)]
Merge "Made text selectable even when autolinks are activated."
Svetoslav Ganov [Fri, 17 Dec 2010 23:45:41 +0000 (15:45 -0800)]
Merge "Bug
3293819. Timepicker is showing single digit for 0, 1, 2 minutes (the rest are fine)"
Alex Sakhartchouk [Fri, 17 Dec 2010 21:17:47 +0000 (13:17 -0800)]
Merge "API reaview cleanup"
Adam Cohen [Fri, 17 Dec 2010 20:19:46 +0000 (12:19 -0800)]
Merge "Addressing issues associated RemoteViewsAdapter's service crashes / disconnects"
Joe Onorato [Fri, 17 Dec 2010 19:52:34 +0000 (11:52 -0800)]
Merge "Fix for the notification panel getting stuck open."
Eric Laurent [Fri, 17 Dec 2010 19:48:02 +0000 (11:48 -0800)]
Merge "Fix issue
3217707."
Gilles Debunne [Fri, 17 Dec 2010 19:31:00 +0000 (11:31 -0800)]
Merge "Removed focusableInTouchMode flag for selectable text."
Chet Haase [Fri, 17 Dec 2010 19:30:17 +0000 (11:30 -0800)]
Merge "Fix for TimePicker not redrawing itself."
Costin Manolache [Fri, 17 Dec 2010 19:28:26 +0000 (11:28 -0800)]
Merge "Add a new attribute to auth descriptors to indicate custom handling of permission and token caching"
Fred Quintana [Fri, 17 Dec 2010 19:27:03 +0000 (11:27 -0800)]
Merge "fix the TooManyDeletes to show up again"
Mike Lockwood [Fri, 17 Dec 2010 19:22:12 +0000 (11:22 -0800)]
Merge "MediaScanner: Add support for scanning empty directories"
Jesse Wilson [Fri, 17 Dec 2010 18:59:30 +0000 (10:59 -0800)]
Merge "Test that DefaultHttpClient responds gracefully when the server closes a socket. b/
2612240"
Dianne Hackborn [Fri, 17 Dec 2010 18:37:25 +0000 (10:37 -0800)]
Merge "Fix issue #
3289835: NullPointerException in..." into gingerbread