30967 Commits

Author SHA1 Message Date
Romain Guy
e8c1c539ca Merge "Document the implementation of saveLayer()." 2010-09-13 18:04:18 -07:00
Romain Guy
1c740bce8a Document the implementation of saveLayer().
The implementation is simple but tricky. Leave explanations to my
future self so that I don't invent a time machine to come back to
now and slap my self.

This change also simplifies the way the GL blending function is
chosen when compositing a layer. It reuses existing OpenGLRenderer
APIs and is easier to understand.

Change-Id: I1b9cf8c5d51e09836d85b8cf157a1c284aa65c59
2010-09-13 18:03:21 -07:00
Romain Guy
82e73f23c4 Merge "Forgot the return value..." 2010-09-13 17:32:58 -07:00
Romain Guy
81ab046a11 Forgot the return value...
Change-Id: Iccf369a613c1cf83f3e948460c567291b084fad2
2010-09-13 17:32:34 -07:00
Romain Guy
dee94fa957 Merge "Fix rendering issue with layers intersecting the clip rect." 2010-09-13 17:29:08 -07:00
Romain Guy
8411f336c7 Fix rendering issue with layers intersecting the clip rect.
Change-Id: Icbe35194fa219ef13ce639d33631235f8d7df3d7
2010-09-13 17:27:57 -07:00
Adam Powell
727d593d25 am 59a29f4a: (-s ours) am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
Merge commit '59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c'

* commit '59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
2010-09-13 17:25:04 -07:00
Irfan Sheriff
5c8e3b5e49 am b62bc963: am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread
Merge commit 'b62bc9632250f77d29baca54419442c8d3c965ef'

* commit 'b62bc9632250f77d29baca54419442c8d3c965ef':
  Fix statusbar display of wifi signalstrength
2010-09-13 17:24:49 -07:00
Dianne Hackborn
e746f03c6c resolved conflicts for merge of 53686433 to master
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
2010-09-13 16:56:10 -07:00
Adam Powell
59a29f4a6c am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
Merge commit 'b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp

* commit 'b07c078921fb917d33075a63d77fdf98221e2bac':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
2010-09-13 16:11:55 -07:00
Adam Powell
b07c078921 Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread 2010-09-13 16:09:51 -07:00
Adam Powell
57361ef001 DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
Change-Id: I03cc18616dec05eb9e0383dc02371366c70cc12b
2010-09-13 16:08:35 -07:00
Irfan Sheriff
b62bc96322 am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread
Merge commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8' into gingerbread-plus-aosp

* commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8':
  Fix statusbar display of wifi signalstrength
2010-09-13 16:08:12 -07:00
Irfan Sheriff
ab2ac88775 Merge "Fix statusbar display of wifi signalstrength" into gingerbread 2010-09-13 16:05:06 -07:00
Robert Greenwalt
fa974c5909 Fix statusbar display of wifi signalstrength
When turning a 1d array into a 2d, be sure and adjust length-checks.
bug:2995809

Change-Id: I9ff53f75958ea7808eb9f44bc05497e86f1807a2
2010-09-13 15:53:26 -07:00
Jaikumar Ganesh
1510770165 Add missing return statement.
Change-Id: Iee4ee8a62c5c85176c457bd674ac25acdf978ae9
2010-09-13 15:24:01 -07:00
Jaikumar Ganesh
20c8f47330 resolved conflicts for merge of 0522f5e9 to master
Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2
2010-09-13 14:57:59 -07:00
Shimeng (Simon) Wang
b6b81f5f39 am 4de4f09e: (-s ours) am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit '4de4f09e8ed95255c1077cfbbaf018877221455d'

* commit '4de4f09e8ed95255c1077cfbbaf018877221455d':
  DO NOT MERGE
2010-09-13 14:43:16 -07:00
Eric Laurent
e931c68f53 am 4d987850: am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread
Merge commit '4d9878502f7661ed34540a485a5942d859e209c7'

* commit '4d9878502f7661ed34540a485a5942d859e209c7':
  Fix volume problems with insert revert
2010-09-13 14:42:59 -07:00
Vasu Nori
992f7d52fa caching code retooled to reduce locking + handle SMP
1. Moved all code related to compiled-sql statement cache to SQLiteCache.java
Removed all caching related code from everywhere else.
2. Moved all code related to compiling a sql statement and caching it to
SQLiteCompiledSql.java. There was some code in SQLiteProgram.java
releated to this. moved it out.
3. Added state to SQLiteCompiledSql. This is to help in debugging.
Change-Id: I63ab0c9c4419e964eb9796d284dd389985763d83
2010-09-13 14:38:24 -07:00
Dianne Hackborn
53686433a9 am 7e9f4eb2: Track client requests through location manager.
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp

* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
  Track client requests through location manager.
2010-09-13 14:34:22 -07:00
Dianne Hackborn
7e9f4eb260 Track client requests through location manager.
This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like...  say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work.  Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
2010-09-13 14:20:48 -07:00
Romain Guy
f4cae9f944 Merge "Forces windows to draw the first time they show." 2010-09-13 12:53:21 -07:00
Romain Guy
58ef7fbf16 Forces windows to draw the first time they show.
Change-Id: I239572ee49bc60f30d957f548104e75844859a93
2010-09-13 12:52:37 -07:00
Nipun Kwatra
5195e615b0 Merge "Enabling time lapse in setProfile, added setCaptureRate" 2010-09-13 12:22:35 -07:00
Nipun Kwatra
4f6bf17407 Enabling time lapse in setProfile, added setCaptureRate
- Time lapse is automatically enabled in setProfile() if a time lapse
  profile is selected. Also audio setup is skipped for time lapse.
- Added setCaptureRate() to set the frame capture rate, which may be
  different from the video playback rate.
- Getting rid of enableTimeLapse() since setProfile() and
  setFrameCaptureDelay() do its job now.

Change-Id: Ifd9f89cea0d05ffbefc22eac4ea5d34147cc1fbe
2010-09-13 12:19:05 -07:00
Jaikumar Ganesh
0522f5e9b7 am cc5494c9: Out Of Band API for Secure Simple Pairing.
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp

* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
  Out Of Band API for Secure Simple Pairing.
2010-09-13 11:52:19 -07:00
Shimeng (Simon) Wang
4de4f09e8e am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp

* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
  DO NOT MERGE
2010-09-13 11:51:55 -07:00
Eric Laurent
4d9878502f am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread
Merge commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a' into gingerbread-plus-aosp

* commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a':
  Fix volume problems with insert revert
2010-09-13 11:51:46 -07:00
Chris Palmer
f5aafff485 Unbreak the build.
Just a quick fix. Will properly re-add @deprecated and update-api next, and
then get API approval.

Change-Id: Idf57a33dc97bc2619cf48509f74d9e0de935124b
2010-09-13 11:40:44 -07:00
Jaikumar Ganesh
cc5494c999 Out Of Band API for Secure Simple Pairing.
Change-Id: I54ded27ab85d46eef3d2cca84f2394b1ffe88ced
2010-09-13 11:40:21 -07:00
Shimeng (Simon) Wang
ba15633a22 Merge "Accessibility support for WebViews" 2010-09-13 11:06:33 -07:00
Shimeng (Simon) Wang
fbd2646705 Merge "DO NOT MERGE" into gingerbread 2010-09-13 11:00:16 -07:00
Maksymilian Osowski
8e0835c08e Merge "Added overridePreference() layoutTestsController function." 2010-09-13 10:54:28 -07:00
Maksymilian Osowski
5e689a7486 Added overridePreference() layoutTestsController function.
Change-Id: I99fbf7490c3c6eb063bf5ed0bbd2bced0f10a967
2010-09-13 18:49:59 +01:00
Shimeng (Simon) Wang
dc9f2b6668 DO NOT MERGE
Use a static variable and methods for the current WebView.

sJavaBridge may not exist by the time onWindowFocusChanged is called.
To avoid an NPE, just static methods that modify a global field.
JWebCoreJavaBridge is a global object anyway so using a static field
will be fine.  To avoid any garbage collection issues, store the
WebView in a WeakReference.

Bug: 2908023
Change-Id: I05e9261f2c3d13c10c73c9b34f3aeea1d12a08a6
2010-09-13 10:47:58 -07:00
Chris Palmer
ed35d0ee85 Merge "Correct the PackageManager.checkSignatures documentation." 2010-09-13 10:39:04 -07:00
Steve Block
20f380771e Merge "Update DumpRenderTree2 to only calculate the WebKit revision once per test run" 2010-09-13 10:29:36 -07:00
Svetoslav Ganov
585f13f8de Accessibility support for WebViews
Change-Id: Ibb139192bae4d60fd53a7872b19c06312bb41558
2010-09-13 10:21:34 -07:00
Eric Fischer
569a57dc01 Merge "Import revised translations." 2010-09-13 10:04:58 -07:00
Steve Block
ab87db4ad8 Update DumpRenderTree2 to only calculate the WebKit revision once per test run
This is obtained by a HTTP request to ThirdPartyProject.prop

Change-Id: I34e310cf52fbcef24bb2a76e64aab5263b3052f1
2010-09-13 17:32:16 +01:00
Eric Laurent
bd2e9ec64d Merge "Fix volume problems with insert revert" into gingerbread 2010-09-13 09:14:39 -07:00
Eric Laurent
27a2fdfb8a Fix volume problems with insert revert
- Use a constant input level to the reverb engine and implement volume control in the
insert reverb. This avoids the volume spikes when an effect that was inserted after
the reverb is disabled or removed.
- Fix clicks (one silent buffer) at the end of the reverb disable period.
- Modified volume management in audioflinger so that the volume ramp is also done by
the insert effect if present when the track is paused (avoids clicks).
- Increased room level for all presets.

Also fixed problems with output stage session (-1):
- effect bundle wrapper was not designed to support session -1
- the permission check in audioflinger for using session -1 failed due to a wrong usage of
getCallingPid()

Change-Id: Id1ff51327263364bf71d3f2668fa5cde4311d84f
2010-09-13 09:08:28 -07:00
Steve Block
c54df24fa9 Remove superfluous FileFilter from DumpRenderTree2 DirListActivity.java
Change-Id: I5e7d86fc4e05ac512ce1b2c55660d3b7f0de2750
2010-09-13 16:04:18 +01:00
Steve Block
5c27bc1c64 When running DumpRenderTree2 from script, remove old results files
This makes sure that should we fail to get a new results file from
the device, we won't ever show an old results file to the user.

Change-Id: Ib00ae391a6b2b43a336370ef23af2d6c95589918
2010-09-13 16:00:42 +01:00
Steve Block
bdebd0621b Update DumpRenderTree2 to store results in /sdcard/layout-test-results
This more closely follows other WebKit platforms, which use
/tmp/layout-test-results.

Change-Id: Ice702b73d7425250d595e8321e14ff3becb66ed5
2010-09-13 15:55:13 +01:00
Steve Block
34c68912be Remove the last remnants in DumpRenderTree2 of the absolute path to the tests
This is no longer required.

Change-Id: I27db10e8c723162b319d9a714b086f508db706e0
2010-09-13 15:51:11 +01:00
Steve Block
7438b53487 Update DumpRenderTree2 text results output to better match HTML version
Always print number of crashes and line things up nicely.

Change-Id: I79a72056ba5ce007fdd4154f1518b9535b595317
2010-09-13 14:28:46 +01:00
Maksymilian Osowski
d96f3360f9 Merge "Updated the AdbUtils class to better manage opening and closing the resources." 2010-09-13 02:52:54 -07:00
Maksymilian Osowski
5af84db492 Updated the AdbUtils class to better manage opening and closing the resources.
Change-Id: I83ebc6409d57a28f9015ec9726f797417ec03212
2010-09-13 10:51:08 +01:00