Commit Graph

13337 Commits

Author SHA1 Message Date
9196034b84 am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2
Merge commit '30d905235074f343ebac6002408ab5c2b360ea14' into eclair-mr2-plus-aosp

* commit '30d905235074f343ebac6002408ab5c2b360ea14':
  Improve error message thrown when eglCreateContext fails.
  Improve error reporting by always returning the public
2009-12-04 15:59:10 -08:00
30d9052350 Merge changes Id682ab72,I9bb4dbae into eclair-mr2
* changes:
  Improve error message thrown when eglCreateContext fails.
  Improve error reporting by always returning the public EGL10.EGL_NO_XXX objects for displays, surfaces, and contexts.
2009-12-04 15:55:47 -08:00
e300deaf2f am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'b6936607b61e3115b5924e41be29c0430dd05613' into eclair-mr2-plus-aosp

* commit 'b6936607b61e3115b5924e41be29c0430dd05613':
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:54:32 -08:00
b6936607b6 Merge change If3c7d429 into eclair-mr2
* changes:
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:50:43 -08:00
19e0db2010 am ebc910da: Merge change Iaad9c8d1 into eclair-mr2
Merge commit 'ebc910da96f4dbb036e16971c1041f8287342aa4' into eclair-mr2-plus-aosp

* commit 'ebc910da96f4dbb036e16971c1041f8287342aa4':
  Restore 7.xml.
2009-12-04 15:42:43 -08:00
ebc910da96 Merge change Iaad9c8d1 into eclair-mr2
* changes:
  Restore 7.xml.
2009-12-04 15:39:59 -08:00
f3c7d4294d Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
When the user lifts her finger up, AbsListView computes the fling velocity
and report a SCROLL_STATE_FLING if the velocity is high enough. However,
when the fling is not initiated because the velocity is too low (case of
a normal scroll), the idle state was not set nor reported.
2009-12-04 15:38:22 -08:00
32c66ee497 am ccbf4c28: am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d' into eclair-mr2-plus-aosp

* commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-04 15:04:35 -08:00
ccbf4c282f am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-mr2

* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-04 15:01:49 -08:00
ae952b3bcc Merge change Ibe1c422a into eclair
* changes:
  If the usage stats file doesn't exist in the first place there is no need to backup and short return.
2009-12-04 14:59:43 -08:00
be1c422a73 If the usage stats file doesn't exist in the first place there is no need to
backup and short return.
2009-12-04 13:59:38 -08:00
5d676ad5d9 am 52f410e2: Merge change Ifef6435a into eclair-mr2
Merge commit '52f410e2ebba103220cffce05b895f0c38a56665' into eclair-mr2-plus-aosp

* commit '52f410e2ebba103220cffce05b895f0c38a56665':
  Enable proper cleanup of OMX nodes managed through stagefright.
2009-12-04 13:41:15 -08:00
52f410e2eb Merge change Ifef6435a into eclair-mr2
* changes:
  Enable proper cleanup of OMX nodes managed through stagefright.
2009-12-04 13:36:57 -08:00
a26b0a401b am ed6dd2e6: am d3bc1994: Merge change I397b6a93 into eclair
Merge commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a' into eclair-mr2-plus-aosp

* commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a':
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-04 12:56:40 -08:00
ed6dd2e6a5 am d3bc1994: Merge change I397b6a93 into eclair
Merge commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda' into eclair-mr2

* commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda':
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-04 12:54:36 -08:00
fef6435a06 Enable proper cleanup of OMX nodes managed through stagefright. 2009-12-04 12:52:40 -08:00
d3bc1994b0 Merge change I397b6a93 into eclair
* changes:
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-04 12:51:44 -08:00
aad9c8d110 Restore 7.xml.
Deletion of "unused" opcode constants should only have happened in
8.xml.
2009-12-04 12:35:50 -08:00
5a2fdbba3d am 48476b0a: Merge change Iab5c49c7 into eclair-mr2
Merge commit '48476b0ade7594a64612db2b867792737193b2ec' into eclair-mr2-plus-aosp

* commit '48476b0ade7594a64612db2b867792737193b2ec':
  move event log tags used by system server into this package
2009-12-04 12:02:09 -08:00
da32419584 am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp

* commit '8a576620cdc7257fc026026c77f7c946bfb760d1':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 12:02:04 -08:00
48476b0ade Merge change Iab5c49c7 into eclair-mr2
* changes:
  move event log tags used by system server into this package
2009-12-04 12:00:13 -08:00
8a576620cd am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2

* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 11:57:10 -08:00
a1a68a4a2d am 6d72f725: Merge change If32b488b into eclair-mr2
Merge commit '6d72f725f18a63afd68f14cc1e2ff8f21d254c77' into eclair-mr2-plus-aosp

* commit '6d72f725f18a63afd68f14cc1e2ff8f21d254c77':
  Add new unit test for RadioGroup/RadioButton.
2009-12-04 11:55:02 -08:00
b5d92322eb am 5c9d6e5b: Merge change Ie46db339 into eclair-mr2
Merge commit '5c9d6e5b8abce6d524c863cffc27e3ecf1c28c01' into eclair-mr2-plus-aosp

* commit '5c9d6e5b8abce6d524c863cffc27e3ecf1c28c01':
  Remove "unused" opcodes from API.
2009-12-04 11:54:55 -08:00
052d9c8b41 Images.Media.DATE_TAKEN should be in milliseconds.
http://b/2297371
2009-12-04 11:51:25 -08:00
6d72f725f1 Merge change If32b488b into eclair-mr2
* changes:
  Add new unit test for RadioGroup/RadioButton.
2009-12-04 11:51:05 -08:00
f32b488bd2 Add new unit test for RadioGroup/RadioButton.
Also fix the AutoCompleteTextViewCallbacks test.
2009-12-04 11:50:22 -08:00
5c9d6e5b8a Merge change Ie46db339 into eclair-mr2
* changes:
  Remove "unused" opcodes from API.
2009-12-04 11:20:54 -08:00
73d403324b am c593d607: Merge change I4261c58d into eclair-mr2
Merge commit 'c593d60787e9abd75c94f70bd929ae13414411e9' into eclair-mr2-plus-aosp

* commit 'c593d60787e9abd75c94f70bd929ae13414411e9':
  Check if another Activity wants to intercept an xml mime type.
2009-12-04 11:12:55 -08:00
c593d60787 Merge change I4261c58d into eclair-mr2
* changes:
  Check if another Activity wants to intercept an xml mime type.
2009-12-04 11:08:28 -08:00
41c4bea27c Don't accidentally signal multiple exceptions in setThreadPriority()
After signalling an exception due to set_sched_policy() failing (probably
because the thread in question had exited before this function was called), we
proceeded to call setpriority() anyway, and raised *another* exception when it
also failed.  We don't do this any more; we just bail after signalling the first
exception.

Change-Id: I397b6a93c73d3f0870176e26759f2bec33e56205
2009-12-04 11:07:48 -08:00
83086f5abb am f2feb0fa: am 48a65d99: Merge change I8c5f2fc3 into eclair
Merge commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f' into eclair-mr2-plus-aosp

* commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f':
  Fix invalidate code path (#2273209).
2009-12-04 10:42:21 -08:00
f2feb0faa2 am 48a65d99: Merge change I8c5f2fc3 into eclair
Merge commit '48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2

* commit '48a65d99cba33db3af2e05982a6825b883be2030':
  Fix invalidate code path (#2273209).
2009-12-04 10:37:59 -08:00
ab5c49c7e7 move event log tags used by system server into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
2009-12-04 10:31:43 -08:00
48a65d99cb Merge change I8c5f2fc3 into eclair
* changes:
  Fix invalidate code path (#2273209).
2009-12-04 10:22:47 -08:00
ecd80ee31c Fix invalidate code path (#2273209).
Cached views would, in some situations, not update if they contained an
animating child. This was caused by clearing the dirty cache flag too
early in View.buildDrawingCache().

Approved by Dr. No mcleron.

Change-Id: I8c5f2fc3e6605657e0da625d60d50b55bb133666
2009-12-04 10:21:55 -08:00
7c24ed6904 Check if another Activity wants to intercept an xml mime type.
WebCore treats */*+xml as content that it can render. This prevents Activities
from intercepting those mime types. Check the same regular expression as
DOMImplementation and then use the PackageManager to look for a matching
Activity.

Requires a change to webcore.

Bug: 2256744
2009-12-04 13:19:52 -05:00
e46db33968 Remove "unused" opcodes from API.
There's no need to have constants like OP_UNUSED_FF in the API.  They
serve no purpose, and it makes life confusing when an opcode is defined
(does the "unused" one go away, breaking the API?  do we have the real
definition and the "unused" definition simultaneously?).

Discussed / approved by API council.
2009-12-04 08:56:54 -08:00
9bb4dbae91 Improve error message thrown when eglCreateContext fails. 2009-12-04 17:15:07 +08:00
d682ab72c5 Improve error reporting by always returning the public
EGL10.EGL_NO_XXX objects for displays, surfaces, and contexts.

This allows clients to compare the returned object against
the public EGL10.EGL_NO_XXX object using a simple == operation.

This fixes bug 2303947 "Java layer EGL API makes it difficult
to tell when certain methods have failed"
2009-12-04 17:07:31 +08:00
8ad6ec2eb4 am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit '8280c2b15f6875b2d387c05df23d264864eb9cd5' into eclair-mr2-plus-aosp

* commit '8280c2b15f6875b2d387c05df23d264864eb9cd5':
  Implement new MockContentProvider. Also make ContentProvider aware of the class.
2009-12-04 00:53:53 -08:00
cdeed78873 am 3077f7df: am 1296d562: Merge change I8b63ab66 into eclair
Merge commit '3077f7df2eaf4127438d4337a9a25766261b02ee' into eclair-mr2-plus-aosp

* commit '3077f7df2eaf4127438d4337a9a25766261b02ee':
  Better animation for sliding widget.
2009-12-04 00:53:48 -08:00
8280c2b15f Implement new MockContentProvider. Also make ContentProvider aware of the class.
Rename the old MockContentProvider to MockIContentProvider since it is
more appropriate name.

Detail:
Current developers inevitably depend on the backend used by ContentProvider,
which is useful but not ideal nor "testable" from the view of them.

Current MockContentResolver only accepts exact "ContentProvider" class, not
IContentProvider interface, since we want to hide "IContentProvider" while
the old MockContentProvider implements IContentProvider and as a result some
methods we want to hide may be exposed to the public SDK now and probably
for the future.

On the other hand, ContentProvider is not interface but an exact class
heavily depends on the internal logic and not suitable for external
developers to use for tests.

The new MockContentProvider introduces the mock implementation
for ContentProvider.
It extends ContentProvider, so "is" ContentProvider, but tries to avoid
depending on any backend System like IPC in Android, etc.
This should be useful from the view of application developers who do not
want to be confused with ContentProvider/ContentResolver backend
implementation "at all" and want to use MockContentResolver without
any other ContentProvider implementations tightly connected to the
external worlds.
2009-12-04 17:48:44 +09:00
3077f7df2e am 1296d562: Merge change I8b63ab66 into eclair
Merge commit '1296d562cf9b80e439724e15b4fdaf6626d2b4df' into eclair-mr2

* commit '1296d562cf9b80e439724e15b4fdaf6626d2b4df':
  Better animation for sliding widget.
2009-12-03 22:18:24 -08:00
1296d562cf Merge change I8b63ab66 into eclair
* changes:
  Better animation for sliding widget.
2009-12-03 22:14:19 -08:00
f345a094e9 am 104d3f75: Merge change I6c84d731 into eclair-mr2
Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp

* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
2009-12-03 20:11:07 -08:00
104d3f755e Merge change I6c84d731 into eclair-mr2
* changes:
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
2009-12-03 20:03:59 -08:00
f740799838 am 39b08235: Add API level 8, currently a copy of 7.
Merge commit '39b082356851e29ba7a0af981eaa27d3b08a387b' into eclair-mr2-plus-aosp

* commit '39b082356851e29ba7a0af981eaa27d3b08a387b':
  Add API level 8, currently a copy of 7.
2009-12-03 18:30:21 -08:00
a8dd0a5454 am 298de218: am 0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit '298de218c540eab6c4e6c3415ab8a5c985c57772' into eclair-mr2-plus-aosp

* commit '298de218c540eab6c4e6c3415ab8a5c985c57772':
  don't reschedule syncs that failed with a tooManyRetries error
2009-12-03 17:25:36 -08:00
39b0823568 Add API level 8, currently a copy of 7. 2009-12-03 17:25:10 -08:00