10601 Commits

Author SHA1 Message Date
Jack Palevich
98a51b8686 am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2
Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp

* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
  Allow multiple OpenGL contexts on systems that support them.
2009-10-13 18:14:51 -07:00
Jeff Sharkey
a788f09894 am 7d776dbb: am a78a9d4c: Correct non-opaque list separator assets.
Merge commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31' into eclair-mr2-plus-aosp

* commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31':
  Correct non-opaque list separator assets.
2009-10-13 18:14:44 -07:00
Dan Egnor
eac70503c2 am 5c8a80b8: Merge change I4410ec8f into eclair-mr2
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp

* commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625':
  Framework-side DropBox service that maintains a size-bounded
2009-10-13 18:14:37 -07:00
Android (Google) Code Review
3b7a1e6d70 Merge change Ic52ba78c into eclair-mr2
* changes:
  Allow multiple OpenGL contexts on systems that support them.
2009-10-13 21:08:17 -04:00
Jeff Sharkey
7d776dbbc5 am a78a9d4c: Correct non-opaque list separator assets.
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-mr2

* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
  Correct non-opaque list separator assets.
2009-10-13 18:05:48 -07:00
Android (Google) Code Review
5c8a80b8fc Merge change I4410ec8f into eclair-mr2
* changes:
  Framework-side DropBox service that maintains a size-bounded queue of data chunks (sort of a blob-oriented logcat).
2009-10-13 21:01:26 -04:00
Jack Palevich
c52ba78cab Allow multiple OpenGL contexts on systems that support them.
Previously we always restricted the number of OpenGL contexts to 1.
2009-10-13 17:58:47 -07:00
Dan Egnor
4410ec8f7c Framework-side DropBox service that maintains a size-bounded
queue of data chunks (sort of a blob-oriented logcat).

In the future, this will be coupled with a revised checkin service that
would actually upload this data.
2009-10-13 17:36:19 -07:00
Eric Fischer
d3ee3b7e2b am bd6c80f6: Import revised translations. DO NOT MERGE
Merge commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64' into eclair-mr2-plus-aosp

* commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64':
  Import revised translations.  DO NOT MERGE
2009-10-13 17:09:00 -07:00
Jeff Sharkey
a78a9d4c93 Correct non-opaque list separator assets.
Fixes http://b/2186076
2009-10-13 16:28:53 -07:00
Eric Fischer
bd6c80f689 Import revised translations. DO NOT MERGE 2009-10-13 16:03:48 -07:00
Jack Palevich
65cc9418af am 332c7934: Merge change I69e21f5f into eclair-mr2
Merge commit '332c793432be71d40473fed803123165c57197cd' into eclair-mr2-plus-aosp

* commit '332c793432be71d40473fed803123165c57197cd':
  GLDual test application.
2009-10-13 15:04:12 -07:00
Doug Zongker
a973eaea45 am b5b67779: Merge change I7fa8c508 into eclair-mr2
Merge commit 'b5b6777903d85349cf4baa07a54e1629551ea712' into eclair-mr2-plus-aosp

* commit 'b5b6777903d85349cf4baa07a54e1629551ea712':
  make erase-password-on-SIM-change optional
2009-10-13 15:04:05 -07:00
Android (Google) Code Review
332c793432 Merge change I69e21f5f into eclair-mr2
* changes:
  GLDual test application.
2009-10-13 17:57:50 -04:00
Jack Palevich
69e21f5f6e GLDual test application.
Draws two images at once, one GL based, one GL2 based.
2009-10-13 14:56:00 -07:00
Android (Google) Code Review
b5b6777903 Merge change I7fa8c508 into eclair-mr2
* changes:
  make erase-password-on-SIM-change optional
2009-10-13 17:26:48 -04:00
Robert Greenwalt
317d1c9e97 am 770d5c4f: am 64d54042: Merge change I61c08260 into eclair
Merge commit '770d5c4f0093a65d20b22f14082911697f9f9b9e' into eclair-mr2-plus-aosp

* commit '770d5c4f0093a65d20b22f14082911697f9f9b9e':
  Futher reduce the logging of EriManager.
2009-10-13 14:21:14 -07:00
Robert Greenwalt
770d5c4f00 am 64d54042: Merge change I61c08260 into eclair
Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-mr2

* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
  Futher reduce the logging of EriManager.
2009-10-13 14:11:54 -07:00
Android (Google) Code Review
64d54042ff Merge change I61c08260 into eclair
* changes:
  Futher reduce the logging of EriManager.
2009-10-13 17:07:10 -04:00
Robert Greenwalt
61c082603f Futher reduce the logging of EriManager.
There was another log statement that was poluting radio logs.

bug: 2180891
2009-10-13 13:53:22 -07:00
Doug Zongker
b80d1d0cc8 am afbf8afa: Merge change I564b5b00 into eclair-mr2
Merge commit 'afbf8afa858a78b66c19f11cfda030e913b34085' into eclair-mr2-plus-aosp

* commit 'afbf8afa858a78b66c19f11cfda030e913b34085':
  add "junk path" -k option to aapt
2009-10-13 13:47:54 -07:00
Android (Google) Code Review
afbf8afa85 Merge change I564b5b00 into eclair-mr2
* changes:
  add "junk path" -k option to aapt
2009-10-13 16:41:21 -04:00
Doug Zongker
dbe7a68cc1 add "junk path" -k option to aapt
Adds a "junk path" option to aapt so that you can do:

   aapt add -k archive.zip path/to/some.file

and have the file stored in the zip under the name "some.file"
(without the path).  Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
2009-10-13 13:33:31 -07:00
Ken Shirriff
947c45b295 am b10036b3: Merge change Iaa321588 into eclair-mr2
Merge commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52' into eclair-mr2-plus-aosp

* commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52':
  Add "deleted" row to Events table.
2009-10-13 13:15:35 -07:00
Android (Google) Code Review
b10036b390 Merge change Iaa321588 into eclair-mr2
* changes:
  Add "deleted" row to Events table.
2009-10-13 16:10:32 -04:00
Doug Zongker
7fa8c508e0 make erase-password-on-SIM-change optional
Make this "feature" controlled by a system property so it can be
enabled only for carriers that want it.
2009-10-13 13:02:49 -07:00
Leon Scroggins
7fd752af75 am 5a4f64fc: Merge change Id5ba82a1 into eclair-mr2
Merge commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e' into eclair-mr2-plus-aosp

* commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e':
  Prevent getFile from copying when the file is too large.
2009-10-13 12:17:53 -07:00
Android (Google) Code Review
5a4f64fcbf Merge change Id5ba82a1 into eclair-mr2
* changes:
  Prevent getFile from copying when the file is too large.
2009-10-13 15:09:18 -04:00
Dianne Hackborn
80f518b74d am d34f3994: am 2a21a77d: Merge change I1369e9ab into eclair
Merge commit 'd34f3994da32d0fcf5f6d6824d123d51c02c988e' into eclair-mr2-plus-aosp

* commit 'd34f3994da32d0fcf5f6d6824d123d51c02c988e':
  Work on issue #2144454: Inconsistent swipes...
2009-10-13 11:56:53 -07:00
Dianne Hackborn
d34f3994da am 2a21a77d: Merge change I1369e9ab into eclair
Merge commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-mr2

* commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
  Work on issue #2144454: Inconsistent swipes...
2009-10-13 11:52:34 -07:00
Derek Sollenberger
b4b5f2af45 am 14592861: Merge change I3dafca18 into eclair-mr2
Merge commit '145928617af865e867f6f27e99173d2a756b9dfd' into eclair-mr2-plus-aosp

* commit '145928617af865e867f6f27e99173d2a756b9dfd':
  Enabling plugin surfaces to update their position in the UI.
2009-10-13 11:47:49 -07:00
Android (Google) Code Review
2a21a77d5c Merge change I1369e9ab into eclair
* changes:
  Work on issue #2144454: Inconsistent swipes...
2009-10-13 14:45:56 -04:00
Dianne Hackborn
1411d1c822 Work on issue #2144454: Inconsistent swipes...
This introduces some hacks in the framework to try to clean up the
data we are getting from the touch screen.  There are two main things
being done here:

1. Look for changes in position that are unreasonably large, and
ignore them.  This is intended to eliminate the spurious jumps that
often happen when releasing.

2. Add some simple adaptive averaging of the touch data.  If the
difference between the last and next point is large enough, we
disable the averaging; otherwise we average up to the last 5 points.
The goal is to get rid of the noise of small movements so that things
like taps don't look like short flings, while still responding quickly
to rapid movement.

For averaging pressure, we also weight each averaged coordinate by
the reported pressure at that point.  This is intended to keep the
coordinates closer together during a release, when the pressure is
going down and the accuracy decreasing.  It may also result in some
other interesting artifacts, but hopefully nothing problematic.

Change-Id: I1369e9ab015c406946a45c2d72547da9c604178f
2009-10-13 11:44:29 -07:00
Android (Google) Code Review
145928617a Merge change I3dafca18 into eclair-mr2
* changes:
  Enabling plugin surfaces to update their position in the UI.
2009-10-13 14:39:37 -04:00
Leon Scroggins
d5ba82a1fe Prevent getFile from copying when the file is too large.
Since the caller expects the data to fit within a certain amount of
space, do not copy into the buffer if the data exceeds that space.

Requires a change to external/webkit
2009-10-13 14:23:56 -04:00
Ray Chen
34cc52922d am b65a90d7: Merge change I73b00501 into eclair-mr2
Merge commit 'b65a90d76ff486208974f0b1dac8e880ba29174b' into eclair-mr2-plus-aosp

* commit 'b65a90d76ff486208974f0b1dac8e880ba29174b':
  Check cursor and URI value for nullity to prevent NPE.
2009-10-13 10:50:30 -07:00
Android (Google) Code Review
b65a90d76f Merge change I73b00501 into eclair-mr2
* changes:
  Check cursor and URI value for nullity to prevent NPE.
2009-10-13 13:43:18 -04:00
Andreas Huber
28af587a05 am c642199d: Merge change Ibd7b43bb into eclair-mr2
Merge commit 'c642199d1d60176980e2781bb78f42dce93e1c84' into eclair-mr2-plus-aosp

* commit 'c642199d1d60176980e2781bb78f42dce93e1c84':
  Separated private from public header files.
2009-10-13 10:41:12 -07:00
Andreas Huber
b7a69ce8f2 am fe324a61: Merge change I8d87cd98 into eclair-mr2
Merge commit 'fe324a61c39d5db59f09fdae81c808d7851841e6' into eclair-mr2-plus-aosp

* commit 'fe324a61c39d5db59f09fdae81c808d7851841e6':
  Fix various compiler warnings accumulated over time.
2009-10-13 10:41:03 -07:00
Android (Google) Code Review
c642199d1d Merge change Ibd7b43bb into eclair-mr2
* changes:
  Separated private from public header files.
2009-10-13 13:38:28 -04:00
Android (Google) Code Review
fe324a61c3 Merge change I8d87cd98 into eclair-mr2
* changes:
  Fix various compiler warnings accumulated over time.
2009-10-13 13:31:58 -04:00
Andreas Huber
bd7b43bb02 Separated private from public header files. 2009-10-13 10:22:55 -07:00
Andreas Huber
8d87cd98a8 Fix various compiler warnings accumulated over time. 2009-10-13 10:06:37 -07:00
Robert Greenwalt
00f166dedc am ceabc645: am 16cb04ab: Merge change If1acb2dd into eclair
Merge commit 'ceabc645d1e4c84b6f8d8b01725a6fa68719842a' into eclair-mr2-plus-aosp

* commit 'ceabc645d1e4c84b6f8d8b01725a6fa68719842a':
  Add a little logging to diagnose wifi cycle bug
2009-10-13 10:03:45 -07:00
Dave Sparks
d6e86a687d am 7d4acc53: am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8' into eclair-mr2-plus-aosp

* commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 10:03:33 -07:00
Robert Greenwalt
ceabc645d1 am 16cb04ab: Merge change If1acb2dd into eclair
Merge commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-mr2

* commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
  Add a little logging to diagnose wifi cycle bug
2009-10-13 09:56:40 -07:00
Dave Sparks
7d4acc5316 am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-mr2

* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 09:56:26 -07:00
Andreas Huber
9550e2892f am cfd55579: OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
Merge commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e' into eclair-mr2-plus-aosp

* commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e':
  OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
2009-10-13 09:56:09 -07:00
Andreas Huber
cfd55579c2 OMXCodec now notifies the reader of changes in the output format by returning a special result/error code. 2009-10-13 09:46:46 -07:00
Android (Google) Code Review
16cb04ab1c Merge change If1acb2dd into eclair
* changes:
  Add a little logging to diagnose wifi cycle bug
2009-10-13 12:45:30 -04:00