31757 Commits

Author SHA1 Message Date
Eric Laurent
48ff0daae3 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
Eric Laurent
b35f36f08d 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
Eric Laurent
4f294558aa Merge "Fix broken insert reverb auto tests." into gingerbread 2010-09-22 09:34:00 -07:00
Eric Laurent
71fe631c78 Fix broken insert reverb auto tests.
commit 27a2fdfb8ad1606bdb686c35e30ae894dd037588 changed the
insert reverb behavior when it is attached to a track in that
the reverb tail is silenced immediately when the track is paused.
The tests have been modified to test the insert reverb on session 0.

Change-Id: I90c6fec40167966853acfeaa4dec2b96f9e7839f
2010-09-22 09:02:23 -07:00
Cary Clark
6310aa605b 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
27c65e26c9 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
dd8f13faf1 Merge "Do not merge: clear text selection on rotate" into gingerbread 2010-09-22 08:29:12 -07:00
Cary Clark
ef60890ee2 Do not merge: clear text selection on rotate
Change-Id: Ic7cb33d830779a75dc6e71db064ceac3c1f90298
http://b/3025142
2010-09-22 10:49:33 -04:00
Steve Block
0e1d6876f9 Fix a bug in DumpRenderTree2's run_apache2.py script
We use a printf style approach when setting the run command in the
command string to be executed. When doing so, the printf must be
applied to only the relevant part of the string. This avoids problems
in the case that other parts of the string contain special character
sequences, such as '%s' in a custom log directive.

Change-Id: I87df773a2872320386a34cb6a5041a9e0ba6f31e
2010-09-22 15:33:05 +01:00
Steve Block
34f3851e95 Fix DumpRenderTree2 to make AbstractResult serializable
This should have been doen as part of
https://android-git.corp.google.com/g/#change,65283

Change-Id: I7a4681f98014ff5a7546a7346fc5523e01f62e19
2010-09-22 15:33:05 +01:00
Steve Block
f09aafa275 Fix DumpRenderTree2 to handle SSL errors
This fixes http/tests/appcache/different-https-origin-resource-main.html

Change-Id: I90e151c027b2d8c55ea82104c02e4a641b933024
2010-09-22 15:33:05 +01:00
Steve Block
70727d1f75 Merge "Fix DumpRenderTree2 to correctly add JavaScript interfaces to new windows" 2010-09-22 07:28:29 -07:00
Patrick Scott
33404191eb 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
acb795424b 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
Patrick Scott
b2044da3f9 Do not merge: cherry-pick a fix for a npe.
Fix a monkey crash when the new WebView is destroyed.

Grab the WebViewCore immediately so that if the Tab is destroyed, we have the
old WebViewCore object and can return the BrowserFrame.

Bug: 2733004
Change-Id: I8cddf9c9d635fc8b50983e4813eadda26cf23348
2010-09-22 09:46:33 -04:00
Dianne Hackborn
adaba84ad7 Merge "Work on fragments in layouts." 2010-09-21 22:17:52 -07:00
Dianne Hackborn
625ac271f8 Work on fragments in layouts.
- Change semantics if IDs associated with these fragments, to
  work correctly when placed in a container.  If the container
  has an ID or you have supplied a tag, the fragment's ID is
  optional.

- To do this, there is a new LayoutInflater API that allows code
  creating views to access the parent container that view will
  be in.

- Fix issues with state management around these fragments.  Now
  correctly retains state when switching to a layout that doesn't
  include the fragment.

Also:

- Add new simple list layouts for items that want to show an
  activated state.
- Add new Activity.dump() that can be invoked with adb shell
  dumpsys; the default implementation dumps fragment state.

Change-Id: I192f35e3ea8c53fbd26cf909095f2a994abfc1b6
2010-09-21 22:08:50 -07:00
Shin-ichiro Fukuda
1198ac4ac6 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
1ad0e9a1a2 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
a7553c5e33 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
5144594cc1 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
Shin-ichiro Fukuda
dd62a056b8 DO NOT MERGE. MOTOYA Japanese fonts
These fonts were contributed by MOTOYA.
Cherry pick from Change-Id: I97879b4e163f6b547305da732c8604d1ac759df4

Change-Id: I97879b4e163f6b547305da732c8604d1ac759df4
2010-09-22 11:21:00 +09:00
Raphael Moll
98699c8fc4 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
77d9a5a55f 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
98bcb41d9b Merge "Fix race reading input configuration during system startup." into gingerbread 2010-09-21 18:33:12 -07:00
Adam Powell
6cf08937a1 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
f847cd4cf0 Merge "Test use of "f" suffix on float initializers." 2010-09-21 18:28:02 -07:00
Jeff Brown
57c59376f4 Fix race reading input configuration during system startup.
Change-Id: I9360c4ec5c29937fce06b44ffc71fca58c8b3d5f
2010-09-21 18:22:55 -07:00
Adam Powell
63b7a203d2 Merge "Text selection anchors changed to use windows" 2010-09-21 18:10:12 -07:00
Adam Powell
879fb6b5d6 Text selection anchors changed to use windows
Manually cherry-picked

Change-Id: Id080dfad0e2f324fef3a5175abc78f76c8bad4c8
2010-09-21 17:56:48 -07:00
Dan Morrill
423d7349bb 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
6869492677 am b255560b: Merge "Fix build" into gingerbread-plus-aosp
Merge commit 'b255560b35f8d776a71a9e8adb127e17c704466e'

* commit 'b255560b35f8d776a71a9e8adb127e17c704466e':
  Fix build
2010-09-21 17:41:08 -07:00
Raphael Moll
f2960b8d66 Refresh the layoutlib_create doc.
Change-Id: I43e92c33d824ace9edd77d90a1b36a5f69d85e7f
2010-09-21 17:39:35 -07:00
Adam Powell
770a681b2f 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
Adam Powell
9aed300279 Text selection anchors changed to use windows
Change-Id: I14f138039f5e3175a8c07f21985715b8447708e5
2010-09-21 17:11:41 -07:00
Dan Morrill
596b55d9c8 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
62018429c2 Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread 2010-09-21 16:59:29 -07:00
Eric Laurent
dab59d1534 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
76f6091185 Merge "Add support for circular gradients to the GL renderer." 2010-09-21 16:50:50 -07:00
Romain Guy
ddb80bebb0 Add support for circular gradients to the GL renderer.
This change also adds full support for local transformation matrices on
sweep and radial gradients.

Change-Id: Id8773bc0766575190e3f3d51984fc5e57b266c3f
2010-09-21 16:48:50 -07:00
Jeff Brown
6bfc93cdd3 Merge "resolved conflicts for merge of aa522ac8 to master" 2010-09-21 16:47:04 -07:00
Jeff Brown
85c3fe443f resolved conflicts for merge of aa522ac8 to master
Change-Id: Ib17ff201e770abc6b9edb58e01f3bb483dc8fa56
2010-09-21 16:45:16 -07:00
Brett Chabot
dca24b8ad8 cherry pick "Fix build" a227db53f0cd30214c393b400436d1e0863396ef into master
Change-Id: I8db1a4b52d87e98efb07c6c1a2b22de7b7d5c297
2010-09-21 16:40:59 -07:00
Brett Chabot
b255560b35 Merge "Fix build" into gingerbread-plus-aosp 2010-09-21 16:06:58 -07:00
Brett Chabot
a227db53f0 Fix build
Change-Id: I2dc9acf6310e25f6862236b6e27b4df1e1a012ba
2010-09-21 16:05:59 -07:00
Eric Laurent
6943b94b8f am a6dc4699: Merge "Fix issue 2913071." into gingerbread
Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp

* commit 'a6dc4699222a484222d1c54d5319f302a02e406b':
  Fix issue 2913071.
2010-09-21 15:59:23 -07:00
Jeff Brown
aa522ac8ba am ed739327: Simplify and optimize MessageQueue loop.
Merge commit 'ed7393274af2f268fcdede5f1a3d72c9af842b8e' into gingerbread-plus-aosp

* commit 'ed7393274af2f268fcdede5f1a3d72c9af842b8e':
  Simplify and optimize MessageQueue loop.
2010-09-21 15:59:14 -07:00
Jeff Brown
fdc85679cc am 4ec134cd: am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread
Merge commit '4ec134cdba52b663506562c6406b07915820b007'

* commit '4ec134cdba52b663506562c6406b07915820b007':
  Looper: use pthread_once for TLS key initialization.
2010-09-21 15:57:13 -07:00
Eric Laurent
a6dc469922 Merge "Fix issue 2913071." into gingerbread 2010-09-21 15:55:17 -07:00
Jeff Brown
4ec134cdba am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread
Merge commit 'cce0cd138dd0dc338db59083052aca01a51bd52d' into gingerbread-plus-aosp

* commit 'cce0cd138dd0dc338db59083052aca01a51bd52d':
  Looper: use pthread_once for TLS key initialization.
2010-09-21 15:52:09 -07:00