OSDN Git Service
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"
Kristian Monsen [Fri, 17 Dec 2010 16:11:14 +0000 (08:11 -0800)]
Merge "Add methods to send messages to the WebViewCore whithout having a reference"
satok [Fri, 17 Dec 2010 09:33:56 +0000 (01:33 -0800)]
Merge "Change "more" button to call InputMethodConfigure in Settings"
Mathias Agopian [Fri, 17 Dec 2010 02:51:01 +0000 (18:51 -0800)]
Merge "fix a small bug that caused screenshot to show garbage in some cases"
Mathias Agopian [Fri, 17 Dec 2010 02:46:17 +0000 (18:46 -0800)]
fix a small bug that caused screenshot to show garbage in some cases
we were not clearing the screen entirely, which caused garbage when
the screen wasn't entirely covered by windows.
Change-Id: Ie9ab9b94eabfa6cafddf45bb14bc733bdc8d35c0
Jaikumar Ganesh [Fri, 17 Dec 2010 02:27:40 +0000 (18:27 -0800)]
Merge "Fix PANU - Bluetooth tethering - JNI calls."
Ben Komalo [Fri, 17 Dec 2010 01:04:54 +0000 (17:04 -0800)]
Merge "Fix incorrect anonymous AnimatorListenerAdapter."
Amith Yamasani [Fri, 17 Dec 2010 00:35:11 +0000 (16:35 -0800)]
Merge "Fix SearchView collapse on text input."
Jaikumar Ganesh [Fri, 17 Dec 2010 00:25:24 +0000 (16:25 -0800)]
Merge "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."
Eric Laurent [Fri, 17 Dec 2010 00:10:24 +0000 (16:10 -0800)]
am
a1608902: am
5a756fb0: Merge "Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
* commit '
a1608902f95dc8ff31a52c1f1c384829a803a701':
Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
Scott Main [Fri, 17 Dec 2010 00:10:16 +0000 (16:10 -0800)]
am
49cdfcf5: am
3165bbb1: cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
* commit '
49cdfcf574996bbe37bf547bac105f9df71253ac':
cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
Scott Main [Fri, 17 Dec 2010 00:10:09 +0000 (16:10 -0800)]
am
c4172983: am
4ea442b4: Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
* commit '
c4172983fb1a5ce1eec08ae1196844bd469643e8':
cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links
Martijn Coenen [Fri, 17 Dec 2010 00:10:02 +0000 (16:10 -0800)]
am
12e5c1a2: am
c58c3f1a: Implement additional Mifare Ultralight convenience methods.
* commit '
12e5c1a21ee0dad786e8e5e7f7ca18e8ffdd53e5':
Implement additional Mifare Ultralight convenience methods.
Martijn Coenen [Fri, 17 Dec 2010 00:09:55 +0000 (16:09 -0800)]
am
bf76b52f: am
0d27f999: Expose reconnect(), to allow applications to reset tag state.
* commit '
bf76b52f05384feddb073ee6aa18091f701d069b':
Expose reconnect(), to allow applications to reset tag state.
Martijn Coenen [Fri, 17 Dec 2010 00:09:42 +0000 (16:09 -0800)]
am
9dce44ff: am
4049f9d0: Implement multi-tech connect, enfore tech exclusivity.
* commit '
9dce44ffbb0edcc59b7f72a59099abb313167d0b':
Implement multi-tech connect, enfore tech exclusivity.
Eric Laurent [Fri, 17 Dec 2010 00:05:16 +0000 (16:05 -0800)]
am
5a756fb0: Merge "Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
* commit '
5a756fb0f1f3f8cd7612284c889dfc69875577a8':
Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
Scott Main [Fri, 17 Dec 2010 00:05:00 +0000 (16:05 -0800)]
am
3165bbb1: cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
* commit '
3165bbb15560ed9facdfb906da55a9b24eb5989a':
cherrypick Change-Id: I7ec40d7c2908bd78b74ada8ba2b6838db4a0bac5 docs: misc fixes for the adb move
Scott Main [Fri, 17 Dec 2010 00:04:54 +0000 (16:04 -0800)]
am
4ea442b4: Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
* commit '
4ea442b49c2f44c180346fe780a2b8c9766b587b':
cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links
Martijn Coenen [Fri, 17 Dec 2010 00:04:47 +0000 (16:04 -0800)]
am
c58c3f1a: Implement additional Mifare Ultralight convenience methods.
* commit '
c58c3f1ae27c0c7f560bd381180397d7f6a2ebed':
Implement additional Mifare Ultralight convenience methods.
Martijn Coenen [Fri, 17 Dec 2010 00:04:41 +0000 (16:04 -0800)]
am
0d27f999: Expose reconnect(), to allow applications to reset tag state.
* commit '
0d27f999f4b1ad51da11946800b40d2978fc6326':
Expose reconnect(), to allow applications to reset tag state.
Martijn Coenen [Fri, 17 Dec 2010 00:04:28 +0000 (16:04 -0800)]
am
4049f9d0: Implement multi-tech connect, enfore tech exclusivity.
* commit '
4049f9d00a86f848d42d2429068496b31a6795ad':
Implement multi-tech connect, enfore tech exclusivity.
Irfan Sheriff [Thu, 16 Dec 2010 22:46:32 +0000 (14:46 -0800)]
Merge "Fix ssid storage regression"
Joe Onorato [Thu, 16 Dec 2010 21:55:50 +0000 (13:55 -0800)]
Merge "Fix the SettingsView so it shows again."
Dianne Hackborn [Thu, 16 Dec 2010 21:07:28 +0000 (13:07 -0800)]
Merge "Fix issue #
3291975: Google services frame work crash..."
Mike Lockwood [Thu, 16 Dec 2010 20:59:07 +0000 (12:59 -0800)]
Merge "Add Process.MEDIA_RW_GID constant"
Andreas Huber [Thu, 16 Dec 2010 20:39:37 +0000 (12:39 -0800)]
Merge "Instead of asserting, gracefully abort and signal and error."
Jason Sams [Thu, 16 Dec 2010 20:22:01 +0000 (12:22 -0800)]
Merge "Remove outdated texture upload functions."
Jesse Wilson [Thu, 16 Dec 2010 20:16:52 +0000 (12:16 -0800)]
Merge "New tests for AndroidHttpClient with a proxy server."
Mike LeBeau [Thu, 16 Dec 2010 19:43:30 +0000 (11:43 -0800)]
Merge "Add new EXTRA_WEB_SEARCH_ONLY to RecognizerIntent API. This can be used to avoid triggering any non-web-search actions from the speech recognizer (such as Voice Actions in the Google implementation). The browser will set this to true to avoid triggering non-web-search actions when speech recognition is requested from the browser."
Eric Laurent [Thu, 16 Dec 2010 19:18:29 +0000 (11:18 -0800)]
Merge "Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
Andreas Huber [Thu, 16 Dec 2010 18:51:15 +0000 (10:51 -0800)]
Merge "The HTTP/1.1 Host request header must include port if it's not the default (80)."
Eric Laurent [Thu, 16 Dec 2010 18:41:16 +0000 (10:41 -0800)]
Merge "Fix speakerphone routing to analog dock"
Vasu Nori [Thu, 16 Dec 2010 18:28:27 +0000 (10:28 -0800)]
Merge "fix downloadmanager tests. add few more. fix some. isolate flaky ones"
Eric Laurent [Thu, 16 Dec 2010 18:28:05 +0000 (10:28 -0800)]
Merge "Fix error in HDMI and digital dock intent strings"
Andreas Huber [Thu, 16 Dec 2010 18:26:48 +0000 (10:26 -0800)]
Merge "Remove now obsolete implementation of streaming from AwesomePlayer."
Andreas Huber [Thu, 16 Dec 2010 18:26:37 +0000 (10:26 -0800)]
Merge "Properly announce decoder output format changes, make sure AMessage::dup does."
James Dong [Thu, 16 Dec 2010 18:24:27 +0000 (10:24 -0800)]
Merge "Give the standard not compliant video sample a chance if its size in the mp4 header is invalid"
Iain Merrick [Thu, 16 Dec 2010 16:52:14 +0000 (08:52 -0800)]
Merge "*Don't* disable CacheManager when using Chromium HTTP stack."
Kristian Monsen [Thu, 16 Dec 2010 16:23:45 +0000 (08:23 -0800)]
Merge "Fix for crash in third-party app"
Hung-ying Tyan [Thu, 16 Dec 2010 15:56:35 +0000 (07:56 -0800)]
Merge "Check port in create peer's SIP profile."
Patrick Scott [Thu, 16 Dec 2010 14:05:16 +0000 (06:05 -0800)]
Merge "Add EXTRA_SKIP_UI to skip the confirmation page."
Steve Block [Thu, 16 Dec 2010 13:37:27 +0000 (05:37 -0800)]
Merge "Add LayoutTest http/tests/appcache/foreign-fallback.html to the DRT ignore list"
Scott Main [Thu, 16 Dec 2010 01:47:02 +0000 (17:47 -0800)]
Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
Jaikumar Ganesh [Thu, 16 Dec 2010 00:07:43 +0000 (16:07 -0800)]
Merge "Add FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT to name changed broadcast."
James Dong [Thu, 16 Dec 2010 00:05:24 +0000 (16:05 -0800)]
Merge "Opted to recognize "h263" or "H263" boxes in an mp4 file"
Gilles Debunne [Thu, 16 Dec 2010 00:01:47 +0000 (16:01 -0800)]
Merge "Support custom themes in TabHost."
Dianne Hackborn [Wed, 15 Dec 2010 23:56:22 +0000 (15:56 -0800)]
Merge "Turn thumbnails back on."
Mathias Agopian [Wed, 15 Dec 2010 22:41:59 +0000 (14:41 -0800)]
workaround [
3201922] display not on: log full of gralloc errors
while we're waiting for the real fix in the gralloc/gpu driver,
this workaround should resolve the issue.
we make sure to call compositionComplete after everytime we do
composition with the GPU (even for the screenshot case), which is
where the buffer locks are released.
Change-Id: I3cb5ad67d48c81a23100172bab77e86a70e29152
Robert Greenwalt [Wed, 15 Dec 2010 23:48:02 +0000 (15:48 -0800)]
Merge "Correct an error code to pass CTS."
Andreas Huber [Wed, 15 Dec 2010 23:37:30 +0000 (15:37 -0800)]
Merge "Properly order the data written out to the transport stream by timestamp."
Patrick Dubroy [Wed, 15 Dec 2010 23:33:29 +0000 (15:33 -0800)]
Merge "Allow a JNI local ref to be passed directly into globalRef()."
Andreas Huber [Wed, 15 Dec 2010 23:22:29 +0000 (15:22 -0800)]
Merge "Initial support for a true streaming player for mpeg2 transport streams."
Brad Fitzpatrick [Wed, 15 Dec 2010 23:16:42 +0000 (15:16 -0800)]
Merge "Put Log.wtf's terrible failure in logcat -b main."
Svetoslav Ganov [Wed, 15 Dec 2010 23:13:49 +0000 (15:13 -0800)]
Merge "Updating the light Date picker theme. Some UI fixes."
Andreas Huber [Wed, 15 Dec 2010 22:55:29 +0000 (14:55 -0800)]
Merge "Proper recovery of timestamp information in the transport stream parser."
Jim Miller [Wed, 15 Dec 2010 22:55:04 +0000 (14:55 -0800)]
Merge "Fix
3148496: Update LockScreen assets & layouts"
Daniel Sandler [Wed, 15 Dec 2010 22:54:52 +0000 (14:54 -0800)]
Merge "Remove unused assets in SystemUI."
Scott Main [Wed, 15 Dec 2010 22:39:33 +0000 (14:39 -0800)]
am
61aeb2b7: (-s ours) am
b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
* commit '
61aeb2b7212cae211ce68b3600ddbe69c6e98bb3':
modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
Mathias Agopian [Wed, 15 Dec 2010 22:38:57 +0000 (14:38 -0800)]
Merge "Fix a problem where hwc and GL composition could show a different buffer"
Jim Miller [Wed, 15 Dec 2010 22:12:21 +0000 (14:12 -0800)]
Merge "Fix
3201849: Tweak WaveView animation; update resource."
Scott Main [Wed, 15 Dec 2010 22:11:08 +0000 (14:11 -0800)]
am
b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
* commit '
b094b0c4a4309f48d9da7253de78ebda20a8a81c':
modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
Jim Miller [Wed, 15 Dec 2010 22:10:49 +0000 (14:10 -0800)]
Merge "Fix
3253629: Tweaks to recent apps"
Xavier Ducrohet [Wed, 15 Dec 2010 21:50:37 +0000 (13:50 -0800)]
Merge "LayoutLib: replace the stack of Graphics2D with custom snapshots."
Adam Cohen [Wed, 15 Dec 2010 21:18:32 +0000 (13:18 -0800)]
Merge "Fix in StackView layout"
Dianne Hackborn [Wed, 15 Dec 2010 21:00:52 +0000 (13:00 -0800)]
am
b32ea255: am
7daaa98c: Merge "Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread
* commit '
b32ea25529589a77ede8faf278068157107ba897':
Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity
Dianne Hackborn [Wed, 15 Dec 2010 20:58:54 +0000 (12:58 -0800)]
am
7daaa98c: Merge "Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread
* commit '
7daaa98c6531373a2a742c1360f0a2795de0619f':
Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity
Dianne Hackborn [Wed, 15 Dec 2010 20:56:53 +0000 (12:56 -0800)]
Merge "Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread
Patrick Dubroy [Wed, 15 Dec 2010 20:44:32 +0000 (12:44 -0800)]
Merge "Turn fatal assertion in decodeRegion into a warning."
Scott Main [Wed, 15 Dec 2010 20:11:10 +0000 (12:11 -0800)]
Merge "docs: updates to menu resource doc for new attributes"
Scott Main [Wed, 15 Dec 2010 20:01:58 +0000 (12:01 -0800)]
am
9278d321: am
52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug
3216642
* commit '
9278d3216837ad45eae13b87f04f050acb4ddafa':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug
3216642
Scott Main [Wed, 15 Dec 2010 20:01:53 +0000 (12:01 -0800)]
am
d88c90fb: am
6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug
3273882
* commit '
d88c90fb0805b2dda5664f413b32ada5a5fa6fdc':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug
3273882
Scott Main [Wed, 15 Dec 2010 19:59:16 +0000 (11:59 -0800)]
am
8591872a: am
92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
* commit '
8591872a5c37754aa3be3ef575d3de667f8ee70c':
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
Scott Main [Wed, 15 Dec 2010 19:56:04 +0000 (11:56 -0800)]
am
52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug
3216642
* commit '
52078255dacabe9b779613b032a4dc3706b2b5d3':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug
3216642
Scott Main [Wed, 15 Dec 2010 19:56:00 +0000 (11:56 -0800)]
am
6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug
3273882
* commit '
6390fa6bdf50a3bf10cd6c54328397fe709f7c37':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug
3273882
Scott Main [Wed, 15 Dec 2010 19:53:20 +0000 (11:53 -0800)]
am
92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
* commit '
92b0308530d21195425c918cbe6057dd84f37992':
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
Eric Laurent [Wed, 15 Dec 2010 19:48:46 +0000 (11:48 -0800)]
Merge "Change audio routing policy for HDMI"
Adam Cohen [Wed, 15 Dec 2010 19:20:43 +0000 (11:20 -0800)]
Merge "New stack visualization"
Irfan Sheriff [Wed, 15 Dec 2010 19:18:04 +0000 (11:18 -0800)]
Merge "Use clear names for native API"
Robert Greenwalt [Wed, 15 Dec 2010 19:13:21 +0000 (11:13 -0800)]
Merge "Fix some older (depricated) API so they work."
Alex Sakhartchouk [Wed, 15 Dec 2010 19:05:23 +0000 (11:05 -0800)]
Merge "Cleanup and refactoring of an earlier cl."
Irfan Sheriff [Wed, 15 Dec 2010 17:58:12 +0000 (09:58 -0800)]
Merge "Handle supplicant stop correctly"
Huahui Wu [Wed, 15 Dec 2010 17:42:35 +0000 (09:42 -0800)]
Merge "b/
2864818 Prompt the SSL error dialog to user and proceed or cancel the request. C++ side cl: https://android-git.corp.google.com/g/#change,84529"
Andreas Huber [Wed, 15 Dec 2010 17:17:21 +0000 (09:17 -0800)]
Merge "Emit better (correct) timestamps that respect AAC upsampling."
Ben Murdoch [Wed, 15 Dec 2010 17:07:02 +0000 (09:07 -0800)]
Merge "Remove fragment as well as the query from URLs when resolving MIME type"
Leon Scroggins [Wed, 15 Dec 2010 15:07:51 +0000 (07:07 -0800)]
Merge "Make a long press on a textfield work."
Jason Sams [Wed, 15 Dec 2010 10:11:26 +0000 (02:11 -0800)]
Merge "Fix mipmap bug introduced with Allocation cleanup. Add syncAll to rsg headers."
Dianne Hackborn [Wed, 15 Dec 2010 08:22:43 +0000 (00:22 -0800)]
Merge "Fix launching of activities that I broke."
James Dong [Wed, 15 Dec 2010 06:25:02 +0000 (22:25 -0800)]
Merge "Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature"
satok [Wed, 15 Dec 2010 05:01:05 +0000 (21:01 -0800)]
Merge "Fix the bug that IME switch button is shown when there are two IME is installed but only one IME is enabled."
Mathias Agopian [Wed, 15 Dec 2010 04:30:37 +0000 (20:30 -0800)]
Fix a problem where hwc and GL composition could show a different buffer
if a surface's buffers are reallocated, the current active buffer will
end-up pointing on one of these until a new buffer is retired.
we're now keeping a reference to the actual buffer until we retire a
new one.
Change-Id: Ib1703947e7a0340694d846e0962576318863b935