7217 Commits

Author SHA1 Message Date
Amith Yamasani
c006604c78 am 774568f7: am 1ee7b645: Merge change I0743a389 into eclair-mr2
Merge commit '774568f73911ae2bb35c816a40d49376ea8300df'

* commit '774568f73911ae2bb35c816a40d49376ea8300df':
  Close popup when Keyboard gets a CANCEL motion event.
2009-12-10 07:53:58 -08:00
Christopher Tate
d1879255c2 am 3a0a9e25: am a5ba0a78: am 767eb427: Merge change If990cab0 into eclair
Merge commit '3a0a9e25a8331e4fb7ea3b7bf7a436db1a155523'

* commit '3a0a9e25a8331e4fb7ea3b7bf7a436db1a155523':
  Make sure to acknowledge stale broadcasts
2009-12-10 07:53:40 -08:00
Grace Kloba
9516bf5647 am 506afbd6: am 3f40bd48: Remove the code where we suspect webkit draw during drag. It was added for the better performance of panning while loading. But it does make sites using touch event look bad as we don\'t have the display tree until touch up.
Merge commit '506afbd600d82a324f59ceb875f664ead4338600'

* commit '506afbd600d82a324f59ceb875f664ead4338600':
  Remove the code where we suspect webkit draw during
2009-12-10 07:53:03 -08:00
Ken Shirriff
630432e424 am d44c2f2c: am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf'

* commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf':
  Migration to TrafficStats.
2009-12-10 07:06:25 -08:00
Bjorn Bringert
507ecd5306 am c99f154b: am dcd8bad3: Merge change Ia28d9547 into eclair-mr2
Merge commit 'c99f154b549ff0bae84b082dc4d80351b341494e'

* commit 'c99f154b549ff0bae84b082dc4d80351b341494e':
  Expose SearchableInfo and getSearchablesInGlobalSearch()
2009-12-10 07:06:00 -08:00
Romain Guy
d35566c77f am 8f4bca2a: am 06ffc12a: Merge change I237c1cee into eclair-mr2
Merge commit '8f4bca2acada86c36c7de59e8891ef120098aa19'

* commit '8f4bca2acada86c36c7de59e8891ef120098aa19':
  Improve exception message thrown when a View's state is of the wrong type.
2009-12-10 07:05:39 -08:00
Dianne Hackborn
314664d247 am 68a3b8b6: am 24eca800: Merge change I887f355f into eclair-mr2
Merge commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3'

* commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3':
  Propagate background scheduling class across processes.
2009-12-10 07:05:18 -08:00
Leon Scroggins
5b214e0f96 am 9f1ea0d4: am 6be3bf23: Some fixes for positioning the WebTextView.
Merge commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be'

* commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be':
  Some fixes for positioning the WebTextView.
2009-12-10 07:04:57 -08:00
Ken Shirriff
8ea486788f am 0e933c85: am f7d0b013: Add TrafficStats class to SDK.
Merge commit '0e933c853ad53037631e5bca5b4a46f056c1e538'

* commit '0e933c853ad53037631e5bca5b4a46f056c1e538':
  Add TrafficStats class to SDK.
2009-12-10 07:04:31 -08:00
Daniel Sandler
1fb1e2f5ea am f43eeef3: am 10c1dfad: Merge change Ifea65fb9 into eclair-mr2
Merge commit 'f43eeef301cb5a0c24c95ffa0425fcabda905b8d'

* commit 'f43eeef301cb5a0c24c95ffa0425fcabda905b8d':
  Move the emergency call button to the top-right when there's no SIM.
2009-12-10 07:02:30 -08:00
Derek Sollenberger
db78a58667 am 45ccb6a5: am 51ef573a: Switching from activity based full screen plugins to a view system overlay.
Merge commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed'

* commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed':
  Switching from activity based full screen plugins to a view system overlay.
2009-12-10 07:02:04 -08:00
Trevor Johns
936b1ba33d am 15650af4: am 7e42e8f3: am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc'

* commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc':
  Updating list of standard Intents in android.content.Intent
2009-12-10 07:01:37 -08:00
Wu-cheng Li
13778accfe am 90073aad: am ebc77994: am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f'

* commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f':
  Document that some parameters will not be null and fix getSupportedPictureFormats.
2009-12-10 07:01:12 -08:00
Dianne Hackborn
b2909dbb87 am aeabdf32: am 0766b2d0: Update service example code.
Merge commit 'aeabdf32a2a38c1627102b90628b7261447d3a5c'

* commit 'aeabdf32a2a38c1627102b90628b7261447d3a5c':
  Update service example code.
2009-12-10 07:00:47 -08:00
Fred Quintana
f7ae3c958b am 517ebaa6: am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '517ebaa69a9c4baed99bb5667b956dab129c96e7'

* commit '517ebaa69a9c4baed99bb5667b956dab129c96e7':
  remove an old STOPSHIP comment
2009-12-10 06:59:55 -08:00
Amith Yamasani
774568f739 am 1ee7b645: Merge change I0743a389 into eclair-mr2
Merge commit '1ee7b6453aaae47a6493a97790b9483aca1556c9' into eclair-mr2-plus-aosp

* commit '1ee7b6453aaae47a6493a97790b9483aca1556c9':
  Close popup when Keyboard gets a CANCEL motion event.
2009-12-09 15:53:02 -08:00
Christopher Tate
3a0a9e25a8 am a5ba0a78: am 767eb427: Merge change If990cab0 into eclair
Merge commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e' into eclair-mr2-plus-aosp

* commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e':
  Make sure to acknowledge stale broadcasts
2009-12-09 15:52:43 -08:00
Grace Kloba
506afbd600 am 3f40bd48: Remove the code where we suspect webkit draw during drag. It was added for the better performance of panning while loading. But it does make sites using touch event look bad as we don\'t have the display tree until touch up.
Merge commit '3f40bd48d278a40603f3f7d7b9d602ecbc09246d' into eclair-mr2-plus-aosp

* commit '3f40bd48d278a40603f3f7d7b9d602ecbc09246d':
  Remove the code where we suspect webkit draw during
2009-12-09 15:51:58 -08:00
Ken Shirriff
d44c2f2c85 am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb' into eclair-mr2-plus-aosp

* commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb':
  Migration to TrafficStats.
2009-12-09 15:50:28 -08:00
Bjorn Bringert
c99f154b54 am dcd8bad3: Merge change Ia28d9547 into eclair-mr2
Merge commit 'dcd8bad3aad8e4af6654ecd1776ebe5a18de94e3' into eclair-mr2-plus-aosp

* commit 'dcd8bad3aad8e4af6654ecd1776ebe5a18de94e3':
  Expose SearchableInfo and getSearchablesInGlobalSearch()
2009-12-09 15:50:05 -08:00
Romain Guy
8f4bca2aca am 06ffc12a: Merge change I237c1cee into eclair-mr2
Merge commit '06ffc12a398bf16fb360d74b7511d946a73a741e' into eclair-mr2-plus-aosp

* commit '06ffc12a398bf16fb360d74b7511d946a73a741e':
  Improve exception message thrown when a View's state is of the wrong type.
2009-12-09 15:49:29 -08:00
Dianne Hackborn
68a3b8b660 am 24eca800: Merge change I887f355f into eclair-mr2
Merge commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1' into eclair-mr2-plus-aosp

* commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1':
  Propagate background scheduling class across processes.
2009-12-09 15:49:02 -08:00
Leon Scroggins
9f1ea0d47f am 6be3bf23: Some fixes for positioning the WebTextView.
Merge commit '6be3bf2393030549306b438b9b17085035729135' into eclair-mr2-plus-aosp

* commit '6be3bf2393030549306b438b9b17085035729135':
  Some fixes for positioning the WebTextView.
2009-12-09 15:48:39 -08:00
Ken Shirriff
0e933c853a am f7d0b013: Add TrafficStats class to SDK.
Merge commit 'f7d0b01387c10f93bf17981d45087810c80f0902' into eclair-mr2-plus-aosp

* commit 'f7d0b01387c10f93bf17981d45087810c80f0902':
  Add TrafficStats class to SDK.
2009-12-09 15:48:11 -08:00
Daniel Sandler
f43eeef301 am 10c1dfad: Merge change Ifea65fb9 into eclair-mr2
Merge commit '10c1dfad63ee7dace03b7914faf3c9891d096e25' into eclair-mr2-plus-aosp

* commit '10c1dfad63ee7dace03b7914faf3c9891d096e25':
  Move the emergency call button to the top-right when there's no SIM.
2009-12-09 15:45:26 -08:00
Derek Sollenberger
45ccb6a55e am 51ef573a: Switching from activity based full screen plugins to a view system overlay.
Merge commit '51ef573a8336c637ac508c49b84b512d8f11fa3a' into eclair-mr2-plus-aosp

* commit '51ef573a8336c637ac508c49b84b512d8f11fa3a':
  Switching from activity based full screen plugins to a view system overlay.
2009-12-09 15:44:30 -08:00
Trevor Johns
15650af4ab am 7e42e8f3: am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad' into eclair-mr2-plus-aosp

* commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad':
  Updating list of standard Intents in android.content.Intent
2009-12-09 15:43:13 -08:00
Wu-cheng Li
90073aadd5 am ebc77994: am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43' into eclair-mr2-plus-aosp

* commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43':
  Document that some parameters will not be null and fix getSupportedPictureFormats.
2009-12-09 15:42:20 -08:00
Dianne Hackborn
aeabdf32a2 am 0766b2d0: Update service example code.
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp

* commit '0766b2d0f398dcad10e332b695bbc0cbe5011882':
  Update service example code.
2009-12-09 15:41:30 -08:00
Fred Quintana
517ebaa69a am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp

* commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99':
  remove an old STOPSHIP comment
2009-12-09 15:40:06 -08:00
Android (Google) Code Review
5c47265a70 Merge change Ibe6eac82
* changes:
  Implement Matrix Palette extension.
2009-12-08 20:13:44 -08:00
Jaikumar Ganesh
7279fb9aee am dbdabca7: am b08170ad: am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4'

* commit 'dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4':
  Add API to get Active Sinks.
2009-12-08 14:50:43 -08:00
Android (Google) Code Review
1ee7b6453a Merge change I0743a389 into eclair-mr2
* changes:
  Close popup when Keyboard gets a CANCEL motion event.
2009-12-08 14:37:38 -08:00
Amith Yamasani
0743a389e8 Close popup when Keyboard gets a CANCEL motion event.
Needed for Extension keyboard feature.
2009-12-08 14:18:19 -08:00
Christopher Tate
a5ba0a7881 am 767eb427: Merge change If990cab0 into eclair
Merge commit '767eb427fa8eca6c842c629cd4bfbf3551692148' into eclair-mr2

* commit '767eb427fa8eca6c842c629cd4bfbf3551692148':
  Make sure to acknowledge stale broadcasts
2009-12-08 14:11:33 -08:00
Grace Kloba
3f40bd48d2 Remove the code where we suspect webkit draw during
drag. It was added for the better performance of panning
while loading. But it does make sites using touch event
look bad as we don't have the display tree until touch up.

Fix http://b/issue?id=2310295
2009-12-08 13:49:50 -08:00
Christopher Tate
08a462524a Make sure to acknowledge stale broadcasts
If a broadcast arrives at a process but the receiver has been unregistered in
the interval between dispatch and its arrival on the receiving process's side,
we were simply dropping the broadcast entirely, leading to spurious ANRs and
potentially issues involving future broadcasts being timed out incorrectly.  Fix
this by making sure to correctly 'finish' a broadcast even when the recipient
app no longer has any receiver that matches the broadcast's profile.

Change-Id: If990cab021a26668052cb536753f6c308d80a5b4
2009-12-08 13:48:45 -08:00
Android (Google) Code Review
1270e2e22b Merge change I96ddd6e2 into eclair-mr2
* changes:
  Migration to TrafficStats.
2009-12-08 12:41:51 -08:00
Android (Google) Code Review
dcd8bad3aa Merge change Ia28d9547 into eclair-mr2
* changes:
  Expose SearchableInfo and getSearchablesInGlobalSearch()
2009-12-08 12:10:47 -08:00
Android (Google) Code Review
06ffc12a39 Merge change I237c1cee into eclair-mr2
* changes:
  Improve exception message thrown when a View's state is of the wrong type.
2009-12-08 11:32:50 -08:00
Romain Guy
237c1ceea3 Improve exception message thrown when a View's state is of the wrong type. 2009-12-08 11:30:25 -08:00
Android (Google) Code Review
24eca800d4 Merge change I887f355f into eclair-mr2
* changes:
  Propagate background scheduling class across processes.
2009-12-08 11:25:48 -08:00
Bjorn Bringert
13107bb186 Expose SearchableInfo and getSearchablesInGlobalSearch()
This is needed for search unbundling.

Fixes http://b/issue?id=2270838

Change-Id: Ia28d954736c9afd68da22a38da966ed780d797c2
2009-12-08 19:21:19 +00:00
Leon Scroggins
6be3bf2393 Some fixes for positioning the WebTextView.
Move the change in position/size before the call to bring into view,
so that the properly positioned field will be brought into view.  It
is also now before we check to see if it is the same textfield, so
it happens in both cases.

Also remove some code which checks the selection and then sets it
unnecessarily.  It was originally surrounding some code which called
setRect, which had a side-effect of changing the selection.  That
code was removed (rendering the remaining code useless), and setRect
no longer has the side effect (the side effect was a result of calling
reqestFocus, which it no longer does - further, the change in selection from
requestFocus no longer affects the textfield's text).
2009-12-08 14:15:25 -05:00
Ken Shirriff
1719a39a4c Migration to TrafficStats.
TrafficStats is the SDK version of NetStat.
2009-12-08 11:14:03 -08:00
Ken Shirriff
f7d0b01387 Add TrafficStats class to SDK.
This class (a rename of NetStat) provides network byte and packet statistics.
NetStat will be removed separately, to avoid breaking other packages when submitting.
2009-12-08 10:50:25 -08:00
Android (Google) Code Review
10c1dfad63 Merge change Ifea65fb9 into eclair-mr2
* changes:
  Move the emergency call button to the top-right when there's no SIM.
2009-12-08 07:59:34 -08:00
Derek Sollenberger
51ef573a83 Switching from activity based full screen plugins to a view system overlay. 2009-12-08 08:12:44 -05:00
Jack Palevich
be6eac828f Implement Matrix Palette extension.
Adds support for formerly-unimplemented methods:

glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES

The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.

This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)

Fixes bug 2308625 "Support matrix palette skinning
in JSR239 and related APIs"

Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:

a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.

b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
2009-12-08 15:43:51 +08:00
Trevor Johns
7e42e8f334 am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-mr2

* commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b':
  Updating list of standard Intents in android.content.Intent
2009-12-07 22:42:46 -08:00