Andreas Huber
5dbafdf5d0
Merge "Stop using the PV software decoders and use ours (based on PV code) instead even in non-FULL_STAGEFRIGHT builds."
2010-02-04 10:59:08 -08:00
Daniel Sandler
e925889974
Merge "Stop scaring the kids when USB is connected."
2010-02-04 10:44:50 -08:00
Ben Murdoch
9abfba76b8
Merge "When a window is closed, destroy the WebView properly so that WebCore is informed of it's destruction."
2010-02-04 09:54:26 -08:00
Grace Kloba
9e512bfdb7
Merge "Enable StreamLoader to be loaded in a separate thread."
2010-02-04 09:47:57 -08:00
Katie McCormick
a7735d8cbc
am b5c01b96: am 8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair
...
Merge commit 'b5c01b96a8e1780d8ac0638041b08e06b8c88a83'
* commit 'b5c01b96a8e1780d8ac0638041b08e06b8c88a83':
SDK doc change: Fixed typo--fingure->finger
2010-02-03 20:27:42 -08:00
Joe Onorato
546b068cb9
Merge "Fix 1667521 - system process crash after bad notification"
2010-02-03 20:25:43 -08:00
Katie McCormick
4376a0cafc
am 8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair
...
Merge commit '8a6c060719c8870f370b82faa48ae2f437915214' into eclair-plus-aosp
* commit '8a6c060719c8870f370b82faa48ae2f437915214':
SDK doc change: Fixed typo--fingure->finger
2010-02-03 20:21:26 -08:00
Dianne Hackborn
12632744a5
Merge "Implement system data migration support."
2010-02-03 18:18:56 -08:00
Adam Powell
91a857b520
Merge "Fixed an overscrolling bug in AbsListView with a root in OverScroller."
2010-02-03 17:05:53 -08:00
Katie McCormick
6225fcd804
Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair
2010-02-03 16:52:18 -08:00
Andreas Huber
b67d3d800a
Merge "Defer creating the video renderer until we see the first video frame."
2010-02-03 16:45:57 -08:00
Scott Main
1528c1677f
Merge "Merge commit '2f7b69aa' into manualmerge"
2010-02-03 16:39:26 -08:00
Eric Fischer
17fb4b24d4
Merge "Fix Czech lock screen date format."
2010-02-03 16:38:49 -08:00
Scott Main
38c66659eb
Merge commit '2f7b69aa' into manualmerge
...
Conflicts:
docs/html/guide/topics/ui/themes.jd
2010-02-03 16:37:03 -08:00
Scott Main
3ef51c88b6
am 98a9fc0a: Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
...
Merge commit '98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp
* commit '98a9fc0a0025a3df7b36f7752fc330eba8810603':
docs: revise the Style and Themes document to improve the
2010-02-03 16:18:17 -08:00
Scott Main
957a1a2571
Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
2010-02-03 16:11:41 -08:00
Andreas Huber
bc54f47081
Merge "Previous change broke A/V sync, this is a better change to eliminate negative media positions."
2010-02-03 15:41:23 -08:00
Chris Tate
bdcab6db9f
Merge "Add auto-restore setting and Backup Manager awareness thereof"
2010-02-03 15:35:28 -08:00
Doug Zongker
d2a670d5a4
Merge "remove android.webkit.HttpDateTime, again"
2010-02-03 15:15:02 -08:00
San Mehat
e9bcf84a07
Merge "NativeDaemonConnector: Improve NativeDaemonException reporting to include the actual error response"
2010-02-03 15:09:53 -08:00
Doug Zongker
7c482454b1
Merge "undo "move HttpDateTime from android.webkit to android-common jar""
2010-02-03 12:57:54 -08:00
Bjorn Bringert
c8a2564170
Merge "Copy ic_menu_search.png to ic_search_category_default.png"
2010-02-03 12:52:21 -08:00
Daisuke Miyakawa
134bc70621
Merge "Honor '+' in phone export in vCard."
2010-02-03 12:44:39 -08:00
Megha Joshi
befcc6d32e
am b299f802: am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
...
Merge commit 'b299f802b2dea19b003a6724d53ecff1b763bab0'
* commit 'b299f802b2dea19b003a6724d53ecff1b763bab0':
Screenshots for sample syncadapter.
2010-02-03 12:34:53 -08:00
Megha Joshi
439270f03e
am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
...
Merge commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp
* commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434':
Screenshots for sample syncadapter.
2010-02-03 12:29:19 -08:00
Megha Joshi
277345ae33
Merge "Screenshots for sample syncadapter." into eclair
2010-02-03 12:24:20 -08:00
Mathias Agopian
04a3f57d19
fix [2133133] Software OpenGL ES Lighting is buggy (GL Gears washed out bug)
...
A typo caused GL_AMBIENT_AND_DIFFUSE to only set the the ambient color.
Fix another typo which caused the viewer position to be wrong for
specular highlights.
Switch back to eye-space lighting, since there are still some issues
with some demos (San Angeles in particular).
2010-02-03 12:13:15 -08:00
Elliott Hughes
bf0a46d0d5
Merge "Remove "StringTest.java"."
2010-02-03 12:05:40 -08:00
Mike Chan
cf474721d9
Merge "BatteryStatsImpl: initalize audio timer"
2010-02-03 12:00:39 -08:00
Doug Zongker
8943766e57
Merge "move HttpDateTime from android.webkit to android-common jar"
2010-02-03 11:21:27 -08:00
Doug Zongker
b1293475be
move HttpDateTime from android.webkit to android-common jar
...
Some to-be-unbundled classes want to use HttpDateTime as well.
Change-Id: I40a001970682f6fbd4d9cd3546bd3f63ebfbe89b
2010-02-03 11:14:29 -08:00
Adam Powell
81847cb1e6
Merge "Javadoc fixes to ScaleGestureDetector for SDK builds"
2010-02-03 11:07:42 -08:00
Marco Nelissen
cab88acd4d
Merge "Fix fastscroll thumb"
2010-02-03 11:05:46 -08:00
Doug Zongker
b54f7aca8e
Merge "use device serial number to seed RNG for generating ANDROID_ID"
2010-02-03 11:03:18 -08:00
Barry Hayes
332d8289f8
Merge "Add a "dalvik.vm.gc.overwritefree" property. When set to "true", the VM will be given the "-Xgc:overwritefree" flag, and the GC will clobber the memory of freed objects."
2010-02-03 10:58:18 -08:00
Marco Nelissen
462d7cca08
Merge "Make the fastscroll thumb tell the parent to not intercept touch events, to keep the list from moving sideways in a "workspace" environment. Fixes one of the issues listed in bug 2374212"
2010-02-03 10:45:51 -08:00
Doug Zongker
10279c8d3f
Merge "expose bootloader & radio versions, hardware string in API"
2010-02-03 10:38:09 -08:00
Romain Guy
87880aa309
Merge "Add missing contentDescription to focusable controls."
2010-02-03 10:37:38 -08:00
Andreas Huber
0074f37229
Merge "AudioPlayer didn't properly account for the latency when calculating the current media time."
2010-02-03 10:30:17 -08:00
Suchi Amalapurapu
8b871bb1aa
Merge "Apps on sdcard: Add new broadcasts"
2010-02-03 10:21:23 -08:00
Ben Murdoch
a908fd5b8d
Merge "Add support for sending touch events in DRT."
2010-02-03 09:15:34 -08:00
Leon Clarke
66cde8130c
Merge "Rebuild a cleaner certificates chain before validating it."
2010-02-03 07:56:58 -08:00
Grace Kloba
45f47821af
am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to WebKit
...
Merge commit '3db1ebaf1cc2a097845f217626e31d69e156b73d'
* commit '3db1ebaf1cc2a097845f217626e31d69e156b73d':
Pass touch event time from Java to WebKit
2010-02-02 23:23:40 -08:00
Jack Palevich
0673586371
Fix ETC1 texture decoding.
...
etc1_decode_image requires the stride argument to be in bytes, but the
surface->stride field is in pixels. Convert by multiplying by pixel size.
2010-02-02 22:50:39 -08:00
Grace Kloba
21549fadef
am 4ed2b1c3: Pass touch event time from Java to WebKit
...
Merge commit '4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98' into eclair-mr2-plus-aosp
* commit '4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98':
Pass touch event time from Java to WebKit
2010-02-02 21:07:05 -08:00
Mathias Agopian
3107535d15
Merge "implement [2396050] Add ETC1 texture support to AGL"
2010-02-02 20:34:15 -08:00
Mathias Agopian
18b915a102
implement [2396050] Add ETC1 texture support to AGL
2010-02-02 20:19:54 -08:00
Xavier Ducrohet
035bcdd780
Merge "Fix the SDK build."
2010-02-02 18:25:38 -08:00
Neal Nguyen
4c11aa6d80
Merge "Modifying Services Tests XML file so it builds with the right permissions."
2010-02-02 17:24:49 -08:00
Mike LeBeau
5053f5c692
Merge "Improve some of the documentation in RecognizerIntent to reduce confusion."
2010-02-02 17:08:05 -08:00