OSDN Git Service
Gil Dobjanschi [Thu, 28 Oct 2010 23:24:41 +0000 (16:24 -0700)]
Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations.
Change-Id: I5f619807435dc75c285446bfd60327bc1c1ecacd
Gil Dobjanschi [Wed, 27 Oct 2010 19:37:34 +0000 (12:37 -0700)]
Merge "Waveform member variables must be private"
Joe Onorato [Wed, 27 Oct 2010 19:29:32 +0000 (12:29 -0700)]
Merge "Make the low battery dialog work again."
Joe Onorato [Wed, 27 Oct 2010 19:29:12 +0000 (12:29 -0700)]
Merge "Move the battery LED code over to the battery service from the notification service (!)"
Steve Block [Wed, 27 Oct 2010 19:29:03 +0000 (12:29 -0700)]
Merge "Hook up CookieManager.getCookie() for Chromium HTTP stack"
Gil Dobjanschi [Wed, 27 Oct 2010 19:26:54 +0000 (12:26 -0700)]
Waveform member variables must be private
Change-Id: I8e61dbe5ad51b455377e39a0918ac82d138d8228
Eric Rowe [Wed, 27 Oct 2010 19:07:44 +0000 (12:07 -0700)]
Merge "Modify bluetooth test cases GB for new HC APIs"
Xavier Ducrohet [Wed, 27 Oct 2010 18:59:05 +0000 (11:59 -0700)]
am
57f7ccc4: am
63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread
Yu Shan Emily Lau [Wed, 27 Oct 2010 18:58:58 +0000 (11:58 -0700)]
am
751cc424: am
8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
Steve Block [Wed, 27 Oct 2010 18:47:45 +0000 (11:47 -0700)]
Merge "Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack"
Jack Palevich [Wed, 27 Oct 2010 18:37:23 +0000 (11:37 -0700)]
Preserve the render mode when recreating the render thread.
Change-Id: I67a12a9598d3ef099bef8727411891614b1bc3f7
Joe Onorato [Mon, 25 Oct 2010 17:42:46 +0000 (10:42 -0700)]
Make the low battery dialog work again.
Change-Id: I97232a3645e6a817c9c5f5f90b88a7e925d36d13
Joe Onorato [Tue, 26 Oct 2010 03:36:47 +0000 (20:36 -0700)]
Move the battery LED code over to the battery service from the notification service (!)
Change-Id: I12d7994ae245a36b8b2c3272fcbe173881caebd0
Xavier Ducrohet [Wed, 27 Oct 2010 18:23:58 +0000 (11:23 -0700)]
am
63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread
Xavier Ducrohet [Wed, 27 Oct 2010 18:22:22 +0000 (11:22 -0700)]
Merge "Fix issue with project resources overriding framework resources." into gingerbread
Xavier Ducrohet [Wed, 27 Oct 2010 18:18:02 +0000 (11:18 -0700)]
Merge "Reimplement the native matrix method using the new delegate way."
Yu Shan Emily Lau [Wed, 27 Oct 2010 18:14:36 +0000 (11:14 -0700)]
am
8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
Yu Shan Emily Lau [Wed, 27 Oct 2010 18:12:58 +0000 (11:12 -0700)]
Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
Marco Nelissen [Wed, 27 Oct 2010 18:11:19 +0000 (11:11 -0700)]
am
cd08ada7: am
67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/
3137511" into gingerbread
Marco Nelissen [Wed, 27 Oct 2010 18:08:14 +0000 (11:08 -0700)]
am
67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/
3137511" into gingerbread
Marco Nelissen [Wed, 27 Oct 2010 18:06:39 +0000 (11:06 -0700)]
Merge "Fix off-by-two and other bugs in the visualization code. b/
3137511" into gingerbread
Amith Yamasani [Wed, 27 Oct 2010 18:04:43 +0000 (11:04 -0700)]
Merge "Fix sub-header height to follow drawable. Floating panels for Preference screens."
Amith Yamasani [Mon, 25 Oct 2010 16:25:38 +0000 (09:25 -0700)]
Fix sub-header height to follow drawable. Floating panels for Preference screens.
Andreas Huber [Wed, 27 Oct 2010 17:58:31 +0000 (10:58 -0700)]
Merge "Remove annoying warning during mpeg4 extraction."
Gil Dobjanschi [Wed, 27 Oct 2010 17:50:28 +0000 (10:50 -0700)]
Merge "Added waveform data support"
Nick Pelly [Wed, 27 Oct 2010 17:46:23 +0000 (10:46 -0700)]
am
222f489f: am
6d55e134: Make best effort attempt to recover NFC service when it dies.
Nick Pelly [Wed, 27 Oct 2010 17:43:19 +0000 (10:43 -0700)]
am
6d55e134: Make best effort attempt to recover NFC service when it dies.
Andreas Huber [Wed, 27 Oct 2010 17:39:57 +0000 (10:39 -0700)]
Merge "FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem."
Gil Dobjanschi [Wed, 27 Oct 2010 17:35:29 +0000 (10:35 -0700)]
Added waveform data support
Change-Id: I28e922e0d6588ffe13da7e814dae61f17446b1e9
Andreas Huber [Wed, 27 Oct 2010 17:33:04 +0000 (10:33 -0700)]
FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem.
Change-Id: I60dd9532b694a1b488743b71f43e107c778d6683
Andreas Huber [Wed, 27 Oct 2010 17:25:44 +0000 (10:25 -0700)]
Remove annoying warning during mpeg4 extraction.
Change-Id: Iffadeefb43bab6da1299b0a0582d6c6990156c32
related-to-bug:
3093774
Marco Nelissen [Wed, 27 Oct 2010 16:06:01 +0000 (09:06 -0700)]
Fix off-by-two and other bugs in the visualization code.
b/
3137511
Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
Kristian Monsen [Wed, 27 Oct 2010 17:07:58 +0000 (10:07 -0700)]
Merge "Fix for simulator build break"
Xavier Ducrohet [Fri, 22 Oct 2010 21:48:17 +0000 (14:48 -0700)]
Reimplement the native matrix method using the new delegate way.
Instead of renaming the old Matrix class into _Original_Matrix
and have layoutlib provide a full new implementation of Matrix,
we keep the old one by only modifying it to implement the native
methods which calls out to a new Matrix_Delegate class.
The goal is to not have to maintain the java portion in
sync between the framework and the layoutlib version.
Change-Id: I3e1aefffbae45e91b75331c0c6ff2260323deacd
Kristian Monsen [Wed, 27 Oct 2010 16:51:29 +0000 (17:51 +0100)]
Fix for simulator build break
strrchr returns a const char* in c++ if you give in a const char*
Change-Id: I15ac2ae9e1d41d7737193146c526fcbddccae27c
Steve Block [Wed, 27 Oct 2010 16:13:48 +0000 (17:13 +0100)]
Hook up CookieManager.getCookie() for Chromium HTTP stack
Requires a change to external/webkit ...
https://android-git.corp.google.com/g/76603
Bug:
3116410
Change-Id: Id0cd5871fd13f952d4f2aa963576a4e610459a18
Leon Scroggins [Tue, 26 Oct 2010 20:35:57 +0000 (16:35 -0400)]
Make sure nativeMotionUp is called.
If someone sets mLogEvent to false to prevent logging,
nativeMotionUp will not be called, so touches to WebView
will no longer work. Make sure this does not happen.
Change-Id: Ie79ccc68677cea2f686f7c7da734bf719910f583
Steve Block [Mon, 25 Oct 2010 11:23:20 +0000 (12:23 +0100)]
Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack
Also requires a change to external/webkit ...
https://android-git.corp.google.com/g/76066
Bug:
3116410
Change-Id: If8562468708e7d68c5be53db3860647687ebf3bd
Steve Block [Wed, 27 Oct 2010 10:29:42 +0000 (11:29 +0100)]
Update Chromium HTTP stack to get database and cache paths from CookieSyncManager
Currently these paths are obtained from the BrowserFrame via JNI.
However, the paths are not synced to the BrowserFrame until the
WebCore thread has started up. This means that if the
WebRequestContext is created on the IO thread, the paths may not be
available.
This change moves the paths from BrowserFrame to CookieSyncManager to
avoid the need to wait for the WebCore thread.
Note that the new methods may be called on either the UI or WebCore
threads, so are synchronised.
Requires a change to external/webkit ...
https://android-git.corp.google.com/g/76579
Change-Id: I8e910ee209c570e90181bd308a78d1987b4d120c
Iain Merrick [Wed, 27 Oct 2010 11:33:09 +0000 (12:33 +0100)]
Strip off MIME types when loading content URLs.
Matching behaviour that has been in ContentLoader.java since
approximately day 0. Without this, we can't load Gmail attachments
with the Chrome HTTP stack because of permission errors -- we have
to load exactly the URL Gmail tells us.
See http://b/issue?id=
3125650
Change-Id: I764036efd428299b2fcd611b62dc046a40d80a55
Iain Merrick [Wed, 27 Oct 2010 10:31:01 +0000 (03:31 -0700)]
Merge "Only AV formats should be handled by MediaPlayer (Java side)"
Iain Merrick [Wed, 27 Oct 2010 09:15:14 +0000 (10:15 +0100)]
Only AV formats should be handled by MediaPlayer (Java side)
Must be submitted with corresponding C++ change (I50da7599).
When opening a text file in the browser, WebKit was attempting to
display it as a movie. This is because the media player now reports
that it can handle various document formats, including plain text.
See http://b/issue?id=
3132917
This CL updates WebViewCore.supportsMimeType() to explicitly check
for audio and video formats only. This is called from WebKit via
JNI, and doesn't seem to be used elsewhere, so it should be a safe
change to make. Renamed to isSupportedMediaMimeType() for clarity.
Test: push a text file to /sdcard/foo.txt, and open it in the
browser (as file:///sdcard/foo.txt).
Change-Id: Id39b770b05ced7c976d8043649845f26115b24c9
Nick Pelly [Wed, 27 Oct 2010 08:14:43 +0000 (01:14 -0700)]
Make best effort attempt to recover NFC service when it dies.
Retrieve the service again from ServiceManager on RemoteException.
Change-Id: Ie227b52019e7deafeab712af1addd6d957f7a8ee
Signed-off-by: Nick Pelly <npelly@google.com>
satok [Wed, 27 Oct 2010 05:11:03 +0000 (14:11 +0900)]
Remove InputMethodAndSubtypeEnabler and call intent of Settings.ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER
Change-Id: I467cfba9644ec266f6a98f7aec0886ad205fef4f
Gil Dobjanschi [Wed, 27 Oct 2010 01:57:57 +0000 (18:57 -0700)]
Merge "Removed the start and end transition types."
Vasu Nori [Wed, 27 Oct 2010 01:39:27 +0000 (18:39 -0700)]
Merge "convert one of the LOGE to LOG_WINDOW msg to reduce grief"
Jack Palevich [Wed, 27 Oct 2010 01:37:10 +0000 (18:37 -0700)]
Merge "OpenGL tracing."
Jack Palevich [Wed, 27 Oct 2010 01:25:56 +0000 (18:25 -0700)]
Merge "Allow a GLSurfaceView to be reattached to a window."
Jack Palevich [Wed, 27 Oct 2010 01:19:14 +0000 (18:19 -0700)]
Allow a GLSurfaceView to be reattached to a window.
This approach is more backwards-compatible than the previous attempt.
The onDetachedFromWindow case is unchanged from the "classic"
GLSurfaceView behavior, except that we don't throw a NPE if the
renderer has never been set.
Change-Id: Ia8103a73366ddb13be44f16b789c929e75ddc792
Vasu Nori [Wed, 27 Oct 2010 00:59:03 +0000 (17:59 -0700)]
Merge "add method in MediaFile to determine if a file is a mediatype of not"
Xavier Ducrohet [Tue, 26 Oct 2010 23:58:34 +0000 (16:58 -0700)]
Fix issue with project resources overriding framework resources.
Framework resources loaded through Drawable.createFromXml could
be overriden by project resources if there were loaded through
a state list drawable where the final resource name was used
by a project resource (of the same type).
This ensures that the XML parser knows that it's a framework
resource being parsed and that the resource resolution uses
that information.
Change-Id: I39cf9eba755e55f1604b968637aeecff969a558d
Xavier Ducrohet [Tue, 26 Oct 2010 23:56:30 +0000 (16:56 -0700)]
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors."
Vasu Nori [Tue, 26 Oct 2010 23:44:44 +0000 (16:44 -0700)]
convert one of the LOGE to LOG_WINDOW msg to reduce grief
grief from people who think this message is bad news.
but in reality, this message is really just an informational message
to aid in debugging
Change-Id: I1a2ab1666a27adb7d3fd210528b2c5218640d53d
Romain Guy [Tue, 26 Oct 2010 23:31:31 +0000 (16:31 -0700)]
Merge "Remove unnecessary GL calls."
Romain Guy [Tue, 26 Oct 2010 23:27:31 +0000 (16:27 -0700)]
Remove unnecessary GL calls.
This change batches calls to glScissor() and removes extra GL
queries and glActiveTexture() calls.
Change-Id: I1cd079d314f87cd9c088f95c8d4909c2f860f6aa
Andreas Huber [Tue, 26 Oct 2010 23:25:51 +0000 (16:25 -0700)]
am
e1e82745: am
2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
Andreas Huber [Tue, 26 Oct 2010 23:23:54 +0000 (16:23 -0700)]
am
2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
Andreas Huber [Tue, 26 Oct 2010 23:21:47 +0000 (16:21 -0700)]
Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
Jason Sams [Tue, 26 Oct 2010 23:16:17 +0000 (16:16 -0700)]
Merge "Begin adding async allocation creation."
Vasu Nori [Tue, 26 Oct 2010 23:12:27 +0000 (16:12 -0700)]
add method in MediaFile to determine if a file is a mediatype of not
this helps DownloadService to avoid invoking MediaScanner on
pdf or other non-mediatype files.
Change-Id: I92514e1a11f5119229c0c7292e410e352a9dbcdd
Justin Ho [Tue, 26 Oct 2010 23:10:57 +0000 (16:10 -0700)]
am
1f61ad17: (-s ours) am
3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
Irfan Sheriff [Tue, 26 Oct 2010 23:08:29 +0000 (16:08 -0700)]
Merge "WifiLock extensions for high performance mode"
Justin Ho [Tue, 26 Oct 2010 23:08:13 +0000 (16:08 -0700)]
am
3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
Justin Ho [Tue, 26 Oct 2010 23:06:28 +0000 (16:06 -0700)]
Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
Adam Cohen [Tue, 26 Oct 2010 22:51:57 +0000 (15:51 -0700)]
Merge "- Made showNext() and showPrevious() on StackView remotable - Made StackView show the transition when showNext() or showPrevious() is called"
Adam Cohen [Tue, 26 Oct 2010 20:54:00 +0000 (13:54 -0700)]
- Made showNext() and showPrevious() on StackView remotable
- Made StackView show the transition when showNext() or
showPrevious() is called
Change-Id: Id6e3e6d9ff374c037323f77d247f1a1e4398009e
Justin Ho [Tue, 26 Oct 2010 22:34:07 +0000 (15:34 -0700)]
DO NOT MERGE - Fixing ringtones that were put in as notifications
Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677
Dianne Hackborn [Tue, 26 Oct 2010 22:25:18 +0000 (15:25 -0700)]
Merge "ClipDescription no longer inherits from ClipData."
Dianne Hackborn [Tue, 26 Oct 2010 19:43:57 +0000 (12:43 -0700)]
ClipDescription no longer inherits from ClipData.
Change-Id: Ie4939f87c7e1628d9c19ecb5c0b3036d1f76ef29
Jack Palevich [Tue, 26 Oct 2010 22:21:24 +0000 (15:21 -0700)]
OpenGL tracing.
Enable with:
adb shell setprop debug.egl.trace 1
Change-Id: Icfbc795f5260141510975228e72234e9aab56a85
Andreas Huber [Tue, 26 Oct 2010 22:01:03 +0000 (15:01 -0700)]
Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.
Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
Yu Shan Emily Lau [Tue, 26 Oct 2010 21:36:09 +0000 (14:36 -0700)]
Add the mediaplayer release in the test validation. This is to ensure the media player release properly.
Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
Xavier Ducrohet [Tue, 26 Oct 2010 21:01:41 +0000 (14:01 -0700)]
Fix rendering of digitalClock/Gallery in Eclipse editors.
Change-Id: Iedcd3184cd9f34be8d0695a51eda953ac68683ce
Romain Guy [Tue, 26 Oct 2010 21:26:15 +0000 (14:26 -0700)]
Merge "Enable display lists."
Eric Rowe [Thu, 23 Sep 2010 02:06:14 +0000 (19:06 -0700)]
Modify bluetooth test cases GB for new HC APIs
Modify bluetooth stress tests pairing and connection test cases for new
honeycomb bluetooth APIs and severly refactor code, including better
organization of broadcast receivers, using broadcast receivers to record
the time (instead of getting the time at the end of the poll).
Change-Id: I3ef28d54d1a013697f67f4c7c8a96aaadcc747d9
Romain Guy [Tue, 26 Oct 2010 21:22:30 +0000 (14:22 -0700)]
Enable display lists.
Change-Id: Id0d9b987251da5b7ecbb5497a55dbb5937430316
Gloria Wang [Tue, 26 Oct 2010 21:16:47 +0000 (14:16 -0700)]
Merge "Do not create drm directory here. Fix for bug
3134576."
Raphael [Tue, 26 Oct 2010 20:55:10 +0000 (13:55 -0700)]
Revert "Fix rendering of digitalClock/Gallery in Eclipse editors."
This reverts commit
25e96ce7b99f9736a6024d25bd65a83774c7640f.
Irfan Sheriff [Fri, 13 Aug 2010 03:26:23 +0000 (20:26 -0700)]
WifiLock extensions for high performance mode
Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).
Bug:
2834260
Change-Id: Id394d265b9876bf0230efb3d222056e9b80b44fd
Jason Sams [Tue, 26 Oct 2010 20:09:17 +0000 (13:09 -0700)]
Begin adding async allocation creation.
Change-Id: I5d1381699e2b334c1d824f357bd6b310a5f79be8
Implement async bitmap upload and clean up types.
Change-Id: Icbe9894e04c1319351c1cd75b0e0017855198f20
Chet Haase [Tue, 26 Oct 2010 19:53:57 +0000 (12:53 -0700)]
Merge "Optimizing ColorFilter in display lists"
Chet Haase [Fri, 22 Oct 2010 23:17:12 +0000 (16:17 -0700)]
Optimizing ColorFilter in display lists
Change-Id: Ie4d5e5b0bc45e0ce47bba144049303c270762e54
Daniel Sandler [Tue, 26 Oct 2010 19:48:35 +0000 (12:48 -0700)]
Merge "Remove logspew."
Daniel Sandler [Tue, 26 Oct 2010 19:37:36 +0000 (15:37 -0400)]
Remove logspew.
Change-Id: Ic713febfb1d92d19321ed512dbf6f38e5e2dfbf4
Mathias Agopian [Tue, 26 Oct 2010 19:26:23 +0000 (12:26 -0700)]
am
85c5ca07: am
2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:23:53 +0000 (12:23 -0700)]
am
1b98a9e6: am
5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:23:46 +0000 (12:23 -0700)]
am
d9588e9c: am
a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:22:12 +0000 (12:22 -0700)]
am
2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:19:48 +0000 (12:19 -0700)]
am
5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:19:43 +0000 (12:19 -0700)]
am
a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:32 +0000 (12:18 -0700)]
Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:19 +0000 (12:18 -0700)]
Merge "add format parameter to setBufferGeometry" into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:18:08 +0000 (12:18 -0700)]
am
f56aac4b: am
d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:07 +0000 (12:18 -0700)]
Merge "fix eglChooseConfig() for special attributes." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:16:10 +0000 (12:16 -0700)]
am
d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:14:17 +0000 (12:14 -0700)]
Merge "Add a way to get a string for an error code." into gingerbread
Xavier Ducrohet [Tue, 26 Oct 2010 19:13:32 +0000 (12:13 -0700)]
am
a44a5e02: am
1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Gloria Wang [Tue, 26 Oct 2010 19:11:55 +0000 (12:11 -0700)]
Do not create drm directory here. Fix for bug
3134576.
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
Xavier Ducrohet [Tue, 26 Oct 2010 19:10:28 +0000 (12:10 -0700)]
am
1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:09:48 +0000 (14:09 -0500)]
Add a way to get a string for an error code.
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d