Commit Graph

21623 Commits

Author SHA1 Message Date
Vasu Nori
d9c52a7c96 Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread 2010-09-22 12:10:37 -07:00
Jesse Wilson
86c49d5639 am eaa2cabf: Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread
Merge commit 'eaa2cabf342e973925fb223104f9971deae27b17' into gingerbread-plus-aosp

* commit 'eaa2cabf342e973925fb223104f9971deae27b17':
  Fix problem where Base64InputStream single-byte reads were unsigned.
2010-09-22 11:51:11 -07:00
Jesse Wilson
edc1238264 Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread 2010-09-22 11:38:43 -07:00
Shimeng (Simon) Wang
e128587482 Merge "Add a fixed viewport margin since website content width changes." 2010-09-22 11:17:50 -07:00
Amith Yamasani
be8b12a0fe Merge "Add an AUTO_TIME_ZONE setting so that we can switch timezones while keeping correct time." 2010-09-22 11:09:37 -07:00
Andreas Huber
a305abcc9c am ada0deb4: am f5a8f2f4: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
Merge commit 'ada0deb4c295f18add04a474c2b396c87b0bee09'

* commit 'ada0deb4c295f18add04a474c2b396c87b0bee09':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
2010-09-22 10:26:39 -07:00
Andreas Huber
f122d46f10 am 1a29d836: am 31e323e6: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread
Merge commit '1a29d8361a03597115a998cc15860791f8ddd503'

* commit '1a29d8361a03597115a998cc15860791f8ddd503':
  Make sure we drain the avc software decoder's output queue once we run out of input data.
2010-09-22 10:22:19 -07:00
Andreas Huber
fd65e1d523 am f5a8f2f4: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
Merge commit 'f5a8f2f4634e4fffbb20c66fa37980d0599a27f1' into gingerbread-plus-aosp

* commit 'f5a8f2f4634e4fffbb20c66fa37980d0599a27f1':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
2010-09-22 10:22:18 -07:00
Vasu Nori
11d05de2d8 am 18f196a1: (-s ours) am 9e1266da: Merge "(do not merge)hide videochat changes in gingerbread. bug:3001483" into gingerbread
Merge commit '18f196a19eb93c8b309c8a3e2093ce4400708348'

* commit '18f196a19eb93c8b309c8a3e2093ce4400708348':
  (do not merge)hide videochat changes in gingerbread. bug:3001483
2010-09-22 10:18:39 -07:00
Andreas Huber
bab8b6403b am 31e323e6: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread
Merge commit '31e323e6c874e6f306e7f35a22350750b23b06de' into gingerbread-plus-aosp

* commit '31e323e6c874e6f306e7f35a22350750b23b06de':
  Make sure we drain the avc software decoder's output queue once we run out of input data.
2010-09-22 10:18:29 -07:00
Andreas Huber
3141fd5690 Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread 2010-09-22 10:15:57 -07:00
Vasu Nori
e031d557f2 am 9e1266da: Merge "(do not merge)hide videochat changes in gingerbread. bug:3001483" into gingerbread
Merge commit '9e1266da66a39c0a4994c7224236d103aa6536eb' into gingerbread-plus-aosp

* commit '9e1266da66a39c0a4994c7224236d103aa6536eb': (1565 commits)
  (do not merge)hide videochat changes in gingerbread. bug:3001483
  Fix a bug in DumpRenderTree2's run_apache2.py script
  Fix DumpRenderTree2 to make AbstractResult serializable
  Fix DumpRenderTree2 to handle SSL errors
  Work on fragments in layouts.
  Text selection anchors changed to use windows
  Add support for circular gradients to the GL renderer.
  cherry pick "Fix build" a227db53f0cd30214c393b400436d1e0863396ef into master
  Test use of "f" suffix on float initializers.
  Detect and throw exception for using
  bring database code in master for 'adb bugreport' in sync with ginger
  Make the reading level scale at least 0.5f apart from overview level.
  Make the breadcrumbs touchable for navigation.
  Added the behavior paramter to transition constructors
  recovery just takes a filename as an argument now
  Updated RSTest to test primitive type assignments.
  STOPSHIP follow up to Change-Id: I392875b62ed270741633f5bffa519932e4a9f985
  add new param to device config properties: db connection pool size
  fix [3018216] UI shrinks / stretches while using apps with IME
  Modifying PendingIntent APIs for collection widgets
  ...
2010-09-22 10:13:34 -07:00
Andreas Huber
c2dbd01de4 Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread 2010-09-22 10:11:51 -07:00
Vasu Nori
a962f6d127 Merge "(do not merge)hide videochat changes in gingerbread. bug:3001483" into gingerbread 2010-09-22 10:10:31 -07:00
Mike Lockwood
aa0186f7ef am 6cec0dc0: am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Merge commit '6cec0dc0e47459553a3a6572abd28a8e49ce5875'

* commit '6cec0dc0e47459553a3a6572abd28a8e49ce5875':
  GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
2010-09-22 10:01:48 -07:00
Mike Lockwood
d56d66a081 am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Merge commit '32371695daf917701f78a86224b58bfda0381e27' into gingerbread-plus-aosp

* commit '32371695daf917701f78a86224b58bfda0381e27':
  GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
2010-09-22 09:57:50 -07:00
Mike Lockwood
ab7a8ac2cf Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread 2010-09-22 09:54:53 -07:00
Hung-ying Tyan
15ea66dbca am 8f05b5c8: am ca54cdaf: Merge "SipService: fix thread/socket leak" into gingerbread
Merge commit '8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a'

* commit '8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a':
  SipService: fix thread/socket leak
2010-09-22 09:45:41 -07:00
Eric Laurent
1ad38018bd am b35f36f0: am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread
Merge commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca'

* commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca':
  Fix broken insert reverb auto tests.
2010-09-22 09:42:59 -07:00
Hung-ying Tyan
204f06d989 am ca54cdaf: Merge "SipService: fix thread/socket leak" into gingerbread
Merge commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c' into gingerbread-plus-aosp

* commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c':
  SipService: fix thread/socket leak
2010-09-22 09:41:17 -07:00
Eric Laurent
5a7555951d am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread
Merge commit '4f294558aa23bc155988838ef153dca731efe707' into gingerbread-plus-aosp

* commit '4f294558aa23bc155988838ef153dca731efe707':
  Fix broken insert reverb auto tests.
2010-09-22 09:38:46 -07:00
Hung-ying Tyan
a5a1eb7cb8 Merge "SipService: fix thread/socket leak" into gingerbread 2010-09-22 09:35:35 -07:00
Eric Laurent
be9efe04c7 Merge "Fix broken insert reverb auto tests." into gingerbread 2010-09-22 09:34:00 -07:00
Cary Clark
c0ff87cd46 am 27c65e26: (-s ours) am dd8f13fa: Merge "Do not merge: clear text selection on rotate" into gingerbread
Merge commit '27c65e26c9b395e5cc5db63ea7a1443bb91e8118'

* commit '27c65e26c9b395e5cc5db63ea7a1443bb91e8118':
  Do not merge: clear text selection on rotate
2010-09-22 08:46:31 -07:00
Cary Clark
7bc0a21acc am dd8f13fa: Merge "Do not merge: clear text selection on rotate" into gingerbread
Merge commit 'dd8f13faf1cb8ad7a5f2573f09fe8436ec8a4ac2' into gingerbread-plus-aosp

* commit 'dd8f13faf1cb8ad7a5f2573f09fe8436ec8a4ac2':
  Do not merge: clear text selection on rotate
2010-09-22 08:35:58 -07:00
Cary Clark
f945f81265 Merge "Do not merge: clear text selection on rotate" into gingerbread 2010-09-22 08:29:12 -07:00
Steve Block
e481c8cdb6 Merge "Fix DumpRenderTree2 to correctly add JavaScript interfaces to new windows" 2010-09-22 07:28:29 -07:00
Patrick Scott
0def8121aa am acb79542: (-s ours) am b2044da3: Do not merge: cherry-pick a fix for a npe.
Merge commit 'acb795424b1e0b73fbdb69c8a93892d05f5689da'

* commit 'acb795424b1e0b73fbdb69c8a93892d05f5689da':
  Do not merge: cherry-pick a fix for a npe.
2010-09-22 07:18:49 -07:00
Patrick Scott
0b75398771 am b2044da3: Do not merge: cherry-pick a fix for a npe.
Merge commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a' into gingerbread-plus-aosp

* commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a':
  Do not merge: cherry-pick a fix for a npe.
2010-09-22 07:03:12 -07:00
Dianne Hackborn
f42d6398b7 Merge "Work on fragments in layouts." 2010-09-21 22:17:52 -07:00
Shin-ichiro Fukuda
43374b8e73 am 5144594c: (-s ours) am dd62a056: DO NOT MERGE. MOTOYA Japanese fonts
Merge commit '5144594cc1e945eaf58b6ed66d26d7a1b7985afc'

* commit '5144594cc1e945eaf58b6ed66d26d7a1b7985afc':
  DO NOT MERGE. MOTOYA Japanese fonts
2010-09-21 20:21:48 -07:00
Raphael Moll
d0c74812f5 am 98699c8f: am f2960b8d: Refresh the layoutlib_create doc.
Merge commit '98699c8fc44358d168183dae47e10758b2d1cb08'

* commit '98699c8fc44358d168183dae47e10758b2d1cb08':
  Refresh the layoutlib_create doc.
2010-09-21 20:21:43 -07:00
Jeff Brown
b685bf4409 am 77d9a5a5: am 98bcb41d: Merge "Fix race reading input configuration during system startup." into gingerbread
Merge commit '77d9a5a55fa52074f18012cf997854a82500fd59'

* commit '77d9a5a55fa52074f18012cf997854a82500fd59':
  Fix race reading input configuration during system startup.
2010-09-21 20:21:27 -07:00
Shin-ichiro Fukuda
90ffd1462d am dd62a056: DO NOT MERGE. MOTOYA Japanese fonts
Merge commit 'dd62a056b8d746c620218a68bb476382f02d8174' into gingerbread-plus-aosp

* commit 'dd62a056b8d746c620218a68bb476382f02d8174':
  DO NOT MERGE. MOTOYA Japanese fonts
2010-09-21 19:35:35 -07:00
Raphael Moll
487fbba5e9 am f2960b8d: Refresh the layoutlib_create doc.
Merge commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24' into gingerbread-plus-aosp

* commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24':
  Refresh the layoutlib_create doc.
2010-09-21 18:58:14 -07:00
Jeff Brown
810ba3f321 am 98bcb41d: Merge "Fix race reading input configuration during system startup." into gingerbread
Merge commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1' into gingerbread-plus-aosp

* commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1':
  Fix race reading input configuration during system startup.
2010-09-21 18:39:39 -07:00
Jeff Brown
452598cc1e Merge "Fix race reading input configuration during system startup." into gingerbread 2010-09-21 18:33:12 -07:00
Adam Powell
bc0c0121af am 770a681b: (-s ours) am 9aed3002: Text selection anchors changed to use windows
Merge commit '770a681b2f5b00e699920317bff04a24676ae143'

* commit '770a681b2f5b00e699920317bff04a24676ae143':
  Text selection anchors changed to use windows
2010-09-21 18:32:54 -07:00
Stephen Hines
40d3f65f4b Merge "Test use of "f" suffix on float initializers." 2010-09-21 18:28:02 -07:00
Adam Powell
9176872e71 Merge "Text selection anchors changed to use windows" 2010-09-21 18:10:12 -07:00
Dan Morrill
816a4684ad am 596b55d9: am 62018429: Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread
Merge commit '596b55d9c82a52049702931839f69a12cd7dc920'

* commit '596b55d9c82a52049702931839f69a12cd7dc920':
  Adding new feature definitions for new sensors (barometer and gyroscope.)
2010-09-21 17:45:33 -07:00
Brett Chabot
faac317626 am b255560b: Merge "Fix build" into gingerbread-plus-aosp
Merge commit 'b255560b35f8d776a71a9e8adb127e17c704466e'

* commit 'b255560b35f8d776a71a9e8adb127e17c704466e':
  Fix build
2010-09-21 17:41:08 -07:00
Adam Powell
dbdd60b9d7 am 9aed3002: Text selection anchors changed to use windows
Merge commit '9aed300279db6953356aed5ef24a42291f5829cb' into gingerbread-plus-aosp

* commit '9aed300279db6953356aed5ef24a42291f5829cb':
  Text selection anchors changed to use windows
2010-09-21 17:20:40 -07:00
Dan Morrill
212b858725 am 62018429: Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread
Merge commit '62018429c2639b8a0f27e9b18b9b186df80bca4d' into gingerbread-plus-aosp

* commit '62018429c2639b8a0f27e9b18b9b186df80bca4d':
  Adding new feature definitions for new sensors (barometer and gyroscope.)
2010-09-21 17:03:42 -07:00
Dan Morrill
01d038ae02 Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread 2010-09-21 16:59:29 -07:00
Eric Laurent
ce2d895ad2 am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbread
Merge commit '6943b94b8f267c83060946bae0961efc30444dee'

* commit '6943b94b8f267c83060946bae0961efc30444dee':
  Fix issue 2913071.
2010-09-21 16:53:20 -07:00
Romain Guy
3c6baac4d3 Merge "Add support for circular gradients to the GL renderer." 2010-09-21 16:50:50 -07:00
Jeff Brown
422ef517fa Merge "resolved conflicts for merge of aa522ac8 to master" 2010-09-21 16:47:04 -07:00
Jeff Brown
9efdba3c3d resolved conflicts for merge of aa522ac8 to master
Change-Id: Ib17ff201e770abc6b9edb58e01f3bb483dc8fa56
2010-09-21 16:45:16 -07:00
Mathias Agopian
a93b957e8e fix typo EGL_NO_IMAGE_KHR -> EGL_NO_SYNC_KHR
Change-Id: I38c87803e32030918f2deb06381eabce0faa870c
2010-09-21 16:22:10 -07:00