15543 Commits

Author SHA1 Message Date
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
Andy McFadden
e35cfda3ae Add new(-ish) Dalvik opcodes to Opcodes.java.
This is a public API change.
2009-12-04 13:42:38 -08:00
Ray Chen
840459e843 am da324195: am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe'

* commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 12:08:00 -08:00
Romain Guy
a6a0f69363 am a1a68a4a: am 6d72f725: Merge change If32b488b into eclair-mr2
Merge commit 'a1a68a4a2d1b1c48b3dc98638cb2e498b6f65408'

* commit 'a1a68a4a2d1b1c48b3dc98638cb2e498b6f65408':
  Add new unit test for RadioGroup/RadioButton.
2009-12-04 12:07:53 -08:00
Andy McFadden
c6b9206e9f am b5d92322: am 5c9d6e5b: Merge change Ie46db339 into eclair-mr2
Merge commit 'b5d92322eb9f9d9e78581b2ac5de35b95b46d113'

* commit 'b5d92322eb9f9d9e78581b2ac5de35b95b46d113':
  Remove "unused" opcodes from API.
2009-12-04 12:07:40 -08:00
Ray Chen
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
Ray Chen
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
Romain Guy
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
Andy McFadden
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
Ray Chen
052d9c8b41 Images.Media.DATE_TAKEN should be in milliseconds.
http://b/2297371
2009-12-04 11:51:25 -08:00
Android (Google) Code Review
6d72f725f1 Merge change If32b488b into eclair-mr2
* changes:
  Add new unit test for RadioGroup/RadioButton.
2009-12-04 11:51:05 -08:00
Romain Guy
f32b488bd2 Add new unit test for RadioGroup/RadioButton.
Also fix the AutoCompleteTextViewCallbacks test.
2009-12-04 11:50:22 -08:00
Android (Google) Code Review
5c9d6e5b8a Merge change Ie46db339 into eclair-mr2
* changes:
  Remove "unused" opcodes from API.
2009-12-04 11:20:54 -08:00
Patrick Scott
057fd95f80 am 73d40332: am c593d607: Merge change I4261c58d into eclair-mr2
Merge commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd'

* commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd':
  Check if another Activity wants to intercept an xml mime type.
2009-12-04 11:18:21 -08:00
Patrick Scott
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
Android (Google) Code Review
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
Romain Guy
c636fb3bcd am 83086f5a: am f2feb0fa: am 48a65d99: Merge change I8c5f2fc3 into eclair
Merge commit '83086f5abbc84bd3ded576161c1709d0e3611ca4'

* commit '83086f5abbc84bd3ded576161c1709d0e3611ca4':
  Fix invalidate code path (#2273209).
2009-12-04 10:47:28 -08:00
Romain Guy
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
Romain Guy
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
Android (Google) Code Review
48a65d99cb Merge change I8c5f2fc3 into eclair
* changes:
  Fix invalidate code path (#2273209).
2009-12-04 10:22:47 -08:00
Romain Guy
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
Patrick Scott
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
Andy McFadden
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
Daisuke Miyakawa
9946639f74 am 8ad6ec2e: am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4'

* commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4':
  Implement new MockContentProvider. Also make ContentProvider aware of the class.
2009-12-04 04:33:05 -08:00
Jim Miller
fb397e73b2 am cdeed788: am 3077f7df: am 1296d562: Merge change I8b63ab66 into eclair
Merge commit 'cdeed7887323048cc42e9c62f3205340a91b97bc'

* commit 'cdeed7887323048cc42e9c62f3205340a91b97bc':
  Better animation for sliding widget.
2009-12-04 04:32:58 -08:00
Naveen Kalla
7570576e7d am f345a094: am 104d3f75: Merge change I6c84d731 into eclair-mr2
Merge commit 'f345a094e90be664f7390d12d505a052ac4b064f'

* commit 'f345a094e90be664f7390d12d505a052ac4b064f':
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
2009-12-04 04:32:33 -08:00
Dianne Hackborn
95f118e46a am f7407998: am 39b08235: Add API level 8, currently a copy of 7.
Merge commit 'f7407998387fdfd1c755084a1c00f2819d27431a'

* commit 'f7407998387fdfd1c755084a1c00f2819d27431a':
  Add API level 8, currently a copy of 7.
2009-12-04 04:32:00 -08:00
Fred Quintana
5ff9239f4f am a8dd0a54: am 298de218: am 0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6'

* commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6':
  don't reschedule syncs that failed with a tooManyRetries error
2009-12-04 04:31:52 -08:00
Andreas Huber
8f8e652715 am f4eb754b: am 2a428fd4: Merge change I85e5d39e into eclair-mr2
Merge commit 'f4eb754b1810a60e640401396c1f9a10be65dffa'

* commit 'f4eb754b1810a60e640401396c1f9a10be65dffa':
  Two more uses of strlcpy that break the sim build. Now fixed.
2009-12-04 04:30:40 -08:00
Jason Sams
cbf6ba8dbb am 3bac3ad2: (-s ours) am 9737dc4d: am 5c49a908: (-s ours) Merge change Ic73ec39b into eclair
Merge commit '3bac3ad2dfb11c99ebfc5cd0374b29259686117e'

* commit '3bac3ad2dfb11c99ebfc5cd0374b29259686117e':
  DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices.  If we see a 0 texture id during bind for rendering, attempt to re-upload.  If this fails log debug info and restart the app.
2009-12-04 04:30:31 -08:00
Scott Main
6eacdea7af am 06ef1d21: am 9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2
Merge commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17'

* commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17':
  Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
2009-12-04 04:30:21 -08:00
Scott Main
6b004b350f am 0633dc49: am e08361d7: am 5d0806c9: Merge change Ia70bd8c4 into eclair
Merge commit '0633dc49fa7862bcd519555ec73803ab6379229d'

* commit '0633dc49fa7862bcd519555ec73803ab6379229d':
  add BluetoothChat sample app to the dev guide
2009-12-04 04:30:13 -08:00
Andreas Huber
d1a8532c84 am b8fb6c0b: am 8d670d34: Merge change I1f1c7bad into eclair-mr2
Merge commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4'

* commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4':
  I accidentally broke this code while refactoring MediaScanner. This is the fix.
2009-12-04 04:28:22 -08:00
Erik Gilling
1d51165f49 am 20208ff6: am 9b565d5b: am cef8d031: Merge change I00d0b54a into eclair
Merge commit '20208ff643b33956c93d1f3fa1fa2c2d06fc7d02'

* commit '20208ff643b33956c93d1f3fa1fa2c2d06fc7d02':
  surfaceflinger: remove un-cached buffer hack for SGX
2009-12-04 04:28:12 -08:00
Dianne Hackborn
8bf73ff274 am 7a1192ff: am eefe7b1b: am b2e49a23: Add API level 7.
Merge commit '7a1192ff54e3e1cfc00cc416b5f5de2ec3422fc0'

* commit '7a1192ff54e3e1cfc00cc416b5f5de2ec3422fc0':
  Add API level 7.
2009-12-04 04:28:00 -08:00
Daisuke Miyakawa
830f24f42e am 0f6357d8: am 67d9aa15: Merge change I6173d7c7 into eclair-mr2
Merge commit '0f6357d855a328eb62210feccff5e44c81578553'

* commit '0f6357d855a328eb62210feccff5e44c81578553':
  Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
2009-12-04 04:27:48 -08:00
Andreas Huber
a3e509c2b7 am 9ee55cc1: am 2d6d609c: Merge change I74bf38a0 into eclair-mr2
Merge commit '9ee55cc1bc6878b243134a558d583786d9215958'

* commit '9ee55cc1bc6878b243134a558d583786d9215958':
  Squashed commit of the following:
2009-12-04 04:27:37 -08:00
Andreas Huber
54be356f74 am 874c508c: am bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit '874c508c5352936c0640317ef44b81c9b632dfd6'

* commit '874c508c5352936c0640317ef44b81c9b632dfd6':
  Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
2009-12-04 04:27:25 -08:00
San Mehat
fb6aafd8f9 am ca84ac88: am d345c6ac: am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch
Merge commit 'ca84ac88c7f6940677f9b796b21779e53965bf06'

* commit 'ca84ac88c7f6940677f9b796b21779e53965bf06':
  base: process: Abort setting the process group if one of the threads fails to switch
2009-12-04 04:27:12 -08:00
Ken Shirriff
762c0b8a7d am 208364d3: am 4850b5cd: Merge change I20d77880 into eclair-mr2
Merge commit '208364d304d332241301870bd75b69e181f72446'

* commit '208364d304d332241301870bd75b69e181f72446':
  Make Gservices setting constants public.
2009-12-04 04:26:59 -08:00
Jaikumar Ganesh
ab4a32d8d8 am 0b18c94f: am 11a2853e: am 8c411fb1: Merge change I79420b02 into eclair
Merge commit '0b18c94f765d8e98be3da037ce9757f099b541b2'

* commit '0b18c94f765d8e98be3da037ce9757f099b541b2':
  Add support for Car Dock.
2009-12-04 04:26:46 -08:00
Scott Main
6b661d28a0 am ea01f514: am 7f1ab539: am 90d311ff: Merge change I33e0f00e into eclair
Merge commit 'ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b'

* commit 'ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b':
  docs: fix markup error in xml sample
2009-12-04 04:26:33 -08:00
Dave Sparks
87256a28fd am b06ecc40: am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2
Merge commit 'b06ecc401160c5906fd1f4c85f61163bc2875200'

* commit 'b06ecc401160c5906fd1f4c85f61163bc2875200':
  Remove old hack A/V sync hack that is no longer needed.
2009-12-04 04:26:18 -08:00
Mike Lockwood
626c77e021 am 20e7c267: am 44000eb2: am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997'

* commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-04 04:26:04 -08:00
Ray Chen
ba343d6427 am 29d503c6: am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit '29d503c6cc9df7882859c689d23609a543b24d8a'

* commit '29d503c6cc9df7882859c689d23609a543b24d8a':
  Fix timezone issue to comply with EXIF standard.
2009-12-04 04:25:49 -08:00
Vasu Nori
1ff9ceb01e am 25bd4f29: am 6d1ec0d8: dealloc compiled-sql statements before deref\'ing them from SQLiteDatabase obj.
Merge commit '25bd4f29e1720d78d164c9749f786a2add6cafe9'

* commit '25bd4f29e1720d78d164c9749f786a2add6cafe9':
  dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
2009-12-04 04:25:34 -08:00
Daniel Sandler
55fb43dd57 am 09380e02: am add86719: am 14bee131: Fix lock screen layouts with emergency call buttons.
Merge commit '09380e0232b9a6652a5ac6d96ac5aec03c755dca'

* commit '09380e0232b9a6652a5ac6d96ac5aec03c755dca':
  Fix lock screen layouts with emergency call buttons.
2009-12-04 04:25:19 -08:00
Daisuke Miyakawa
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
Jim Miller
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
Daisuke Miyakawa
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