12418 Commits

Author SHA1 Message Date
Romain Guy
48daa54d31 Add extra blending modes.
This change adds the following blending modes for shaders and color filters:
Add
Multiply
Screen
Overlay
Darken
Lighten

Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
2010-08-10 21:42:40 -07:00
Romain Guy
7a70374606 Merge "Fast text selection drawing." 2010-08-10 14:59:18 -07:00
Romain Guy
a48a1a87ba Fast text selection drawing.
Change-Id: I93fb1312b47bc05345defa9b6cfe47c0658bb329
2010-08-10 14:59:15 -07:00
Jeff Hamilton
b721b47811 Add a constructor from CursorAdapter to ResourceCursorAdapter.
Change-Id: I423bab1907c24a718a8575d5cbe0cee0e5e4968e
2010-08-10 16:17:09 -05:00
Romain Guy
623ee2a569 Merge "Fix tons of bugs and add new text rendering support." 2010-08-10 12:23:49 -07:00
Romain Guy
61c8c9c5b2 Fix tons of bugs and add new text rendering support.
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
2010-08-10 12:22:01 -07:00
Eric Fischer
8c9d61c459 Merge "Import revised translations." 2010-08-10 12:18:50 -07:00
Eric Fischer
28269e91d1 Import revised translations.
Change-Id: Idaaed3b13133d531dfd6055809c66df3fba250bb
2010-08-10 12:10:18 -07:00
Eric Rowe
542cf2c9cf am 7cb0fc58: am edae848e: am 301c437b: Remove @LargeTest annotations
Merge commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a'

* commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a':
  Remove @LargeTest annotations
2010-08-10 12:04:04 -07:00
Eric Rowe
7cb0fc5880 am edae848e: am 301c437b: Remove @LargeTest annotations
Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp

* commit 'edae848eb62e27b8e987aa89557d1456304fada7':
  Remove @LargeTest annotations
2010-08-10 12:00:07 -07:00
Eric Rowe
edae848eb6 am 301c437b: Remove @LargeTest annotations
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread

* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
  Remove @LargeTest annotations
2010-08-10 11:53:59 -07:00
Chet Haase
fd2b002bcf Add 3D rotation to View
Change-Id: I4aa2542eb821e82d44e13d69b0938de13ffd4f0d
2010-08-10 10:36:21 -07:00
Brett Chabot
4f94181282 am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
Merge commit 'e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp

* commit 'e967ee49b5a86de2be11dd1d28283c337b01e537':
  Fix gingerbread FrameworkCoreTests makefile.
2010-08-10 10:30:32 -07:00
Jeff Hamilton
f0cfe3438a Add a few helpful APIs.
Change-Id: Ie57aa71eb77a1e0fb058f4eb6f40d4144a6dfce7
2010-08-10 10:13:18 -05:00
Mike Lockwood
ff68468f1b Merge changes I4f117090,Ifd449c4e
* changes:
  MTP: Push queries for supported formats and properties up to Java.
  MTP: turn off verbose logging
2010-08-10 06:13:35 -07:00
Mike Lockwood
4b322ce4fb MTP: Push queries for supported formats and properties up to Java.
Change-Id: I4f117090340e3916afda3d194521a6092a672ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-10 09:00:30 -04:00
Steve Block
68dede3d66 Hook up mock for testing DeviceOrientation in DRT
Change-Id: I99fbe328807428aa0d94893545bad0697ccb71d7
2010-08-10 12:00:35 +01:00
Adam Powell
dec9dfd0f9 Support ActionBar in Dialogs
Dialogs planning on using an ActionBar must have an appropriate
theme. (Later on this will likely be default.)

Change-Id: I7fbf5f76eed3d10765fddeaf211e4decb4e89f87
2010-08-09 22:18:24 -07:00
Jaikumar Ganesh
feb1a4e5e0 am 4a671a74: am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
Merge commit '4a671a745202cb15cc668d46400731a03b068558'

* commit '4a671a745202cb15cc668d46400731a03b068558':
  Update javadoc for the API and change return of getBondedDevices().
2010-08-09 20:00:53 -07:00
Konstantin Lopyrev
6f4169cb28 am 75493be9: am 63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
Merge commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887'

* commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887':
  Make sure profiling is done only for views that are actually measured, laid out and drawn.
2010-08-09 20:00:44 -07:00
Jaikumar Ganesh
39e8a8a04d am 4e25db6a: am cbaef518: Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
Merge commit '4e25db6a51c4182139b85e3b01317d161f944bbb'

* commit '4e25db6a51c4182139b85e3b01317d161f944bbb':
  Check whether Bluetooth is enabled before making any API calls.
2010-08-09 20:00:36 -07:00
Jaikumar Ganesh
4a671a7452 am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
Merge commit '745d1e905886ed0d8fa0a8590463093d125bc53a' into gingerbread-plus-aosp

* commit '745d1e905886ed0d8fa0a8590463093d125bc53a':
  Update javadoc for the API and change return of getBondedDevices().
2010-08-09 19:53:57 -07:00
Konstantin Lopyrev
75493be9c0 am 63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
Merge commit '63cca69157eae17da2a5492d1bcb7330061a52ac' into gingerbread-plus-aosp

* commit '63cca69157eae17da2a5492d1bcb7330061a52ac':
  Make sure profiling is done only for views that are actually measured, laid out and drawn.
2010-08-09 19:53:44 -07:00
Jaikumar Ganesh
4e25db6a51 am cbaef518: Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
Merge commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d' into gingerbread-plus-aosp

* commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d':
  Check whether Bluetooth is enabled before making any API calls.
2010-08-09 19:53:16 -07:00
Manuel Roman
53aa7afe29 Merge "Incorporated Joe's comments" 2010-08-09 18:57:45 -07:00
Manuel Roman
2c96a0c7ac Incorporated Joe's comments
Change-Id: I07f9b00282acb5e1b505b578e6fae1dcb90d1e52
2010-08-09 18:53:09 -07:00
Brett Chabot
56718cb1cb Fix gingerbread FrameworkCoreTests makefile.
android-common should be included as a static library.

Change-Id: I539962904c84ef30e6d7bd1b48d0bc07e0757d58
2010-08-09 18:49:54 -07:00
Dmitri Plotnikov
09328a254b Removing closed cursor on stop
The client of the loader may have already closed the cursor,
so we need to forget it, otherwise the closed cursor
will be redelivered on start.


Change-Id: I30e005ea0827966956bc276a2d3d7b13c95850af
2010-08-09 18:01:31 -07:00
Jaikumar Ganesh
745d1e9058 Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread 2010-08-09 17:30:25 -07:00
Konstantin Lopyrev
63cca69157 Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread 2010-08-09 17:02:39 -07:00
Jaikumar Ganesh
fec86f4aa2 Update javadoc for the API and change return of getBondedDevices().
getBondedDevices() *might* work if called before the Bluetooth
State intent is broadcasted. However, this can cause ANRs and problems.
This API was updated to return null, if called before the intent
is received. However, this might cause existing apps to crash. Return
an empty set instead.

Change-Id: Ibc484d3394aa0bbebd651221efde6a7015ce7110
2010-08-09 17:01:21 -07:00
Dianne Hackborn
aebf9ea3a8 Merge "This may fix LoaderManager bug where a closed cursor could be used." 2010-08-09 16:57:18 -07:00
Dianne Hackborn
debb2e25b3 This may fix LoaderManager bug where a closed cursor could be used.
Change-Id: I362d5f86dcbdbede921ef9d29c849ed6401850ea
2010-08-09 16:32:52 -07:00
Adam Powell
78aa1f0b5e Fix a bug where canceled action modes show a bar anyway
Change-Id: I8fcdc047f303db4c8aa9f1902e37bb4e5f469620
2010-08-09 16:18:12 -07:00
Eric Rowe
301c437b55 Remove @LargeTest annotations
Change-Id: Ib7e6f6e8b6437db5ca2ad2bcb89f079a0cbf7453
2010-08-09 15:35:48 -07:00
Jaikumar Ganesh
cbaef51847 Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread 2010-08-09 13:50:28 -07:00
Jaikumar Ganesh
f5ff170be1 Check whether Bluetooth is enabled before making any API calls.
For example, Settings app makes calls to get Bonded Devices
before Bluetooth is on. This leads to ANRs and will
prevent autoconnection.

Change-Id: I56748a9bd1d603b5782c17775c6b20b831bf6572
2010-08-09 13:49:40 -07:00
Romain Guy
02890fd0f9 Replace Bitmap's finalizers with PhantomReferences.
This change also removes the use of SoftReferences for View's
drawing cache.

A bitmap now creates a PhantomReference enqueued in a reference
queue provided by the new Finalizers class. This queue is polled
from a thread started after forking zygote. That thread is in charge
of clearing the references after GC runs and of calling reclaim()
on them. The reclaim() method is now how finalizers are run.

Note that a PhantomReference cannot be kept in the instance it
refers to, which is why they are kept in a separate List.

Change-Id: If3c1a5e9dc23fa49e34857860d730f5cf5ad5926
2010-08-09 09:44:40 -07:00
Steve Block
8576301c38 Merge WebKit at r64523 : Update WebView useragent string
Change-Id: I21c0660b7b14aa123aead0c66f49e4f3b013741b
2010-08-09 15:39:50 +01:00
Dianne Hackborn
23fdaf6fb6 Add new ContentProvider for doing conversions to data streams.
This introduces basic infrastructure that should allow content
providers holding complex data to perform on-demand conversion
of their data to streams of various types.  It is achieved through
two new content provider APIs, one to interrogate the possible
stream MIME types the provider can return, and the other to
request a stream of data in a particular MIME type.

Because implementations of this will often need to do on-demand
data conversion, there is also a utility intoduced in ContentProvider
for subclasses to easily run a function to write data into a
pipe that is read by the client.

This feature is mostly intended for cut and paste and drag and
drop, as the complex data interchange allowing the source and
destination to negotiate data types and copy (possible large)
data between them.  However because it is fundamental facility
of ContentProvider, it can be used in other places, such as for
more advanced GET_CONTENT data exchanges.

An example implementation of this would be in ContactsProvider,
which can now provider a data stream when a client opens certain
pieces of it data, to return data as flat text, a vcard, or other
format.

Change-Id: I58627ea4ed359aa7cf2c66274adb18306c209cb2
2010-08-08 18:49:31 -07:00
Romain Guy
1639351139 Make libhwui entirely optional.
The makefile variable USE_OPENGL_RENDERER must be set to true to compile
libhwui and the related code in the JNI layer.

This change also removes obsolete APIs from Canvas that must not be used
and would be confusing if left in. These APIs were remnants of our first
attempt at an OpenGL renderer for the view hierarchy and had not been
taken out before Android 1.0 was released.

Change-Id: I2475ff1307212bab26c926724f3c508681c7dae1
2010-08-08 17:45:07 -07:00
Jesse Wilson
d07fb882f8 Optimizing skipValue() to avoid allocation.
I ran a quick benchmark on a desktop VM: this shortened the time
to parse a complete JSON document by ~25%.

Change-Id: Id479734654addfe86f4bf251f0dd6e78843023bf
http://microbenchmarks.appspot.com/run/jessewilson@google.com/twitter.JsonParseBenchmark/366001
2010-08-06 19:30:07 -07:00
Jesse Wilson
1ba4171405 Adding JsonReader.setLenient() to handle malformed JSON strings.
Also replacing setIndentSpaces() with a more general purpose method,
setIndent().

Change-Id: I64fbe4901aec23de5392362c1d40b77bc2b5566b
2010-08-06 19:24:54 -07:00
Dan Egnor
1ddf340bfc am 6f50a956: am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52'

* commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 19:07:24 -07:00
Steve Howard
4938d79160 am d49d4031: am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Merge commit 'd49d4031d654398904d5af30c488a3b32b176122'

* commit 'd49d4031d654398904d5af30c488a3b32b176122':
  Slight improvement (hopefully) to orientation sensing.
2010-08-06 19:06:48 -07:00
Steve Howard
bd576042a5 am 974c993f: am 8e15afe7: Make downloads visible by default.
Merge commit '974c993fc3771169efa73e40981d18ac0969fac8'

* commit '974c993fc3771169efa73e40981d18ac0969fac8':
  Make downloads visible by default.
2010-08-06 19:06:31 -07:00
Dan Egnor
6f50a95680 am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp

* commit '799f2bb04102b4b692b52eed5c36aea9a8cde471':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:59:49 -07:00
Dan Egnor
799f2bb041 am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit 'b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread

* commit 'b37bca9e79489a1abd848ce762bb7d87203b3414':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:55:05 -07:00
Steve Howard
d49d4031d6 am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Merge commit '9fbf00cb041eeb22acad93deace9712c57b4c594' into gingerbread-plus-aosp

* commit '9fbf00cb041eeb22acad93deace9712c57b4c594':
  Slight improvement (hopefully) to orientation sensing.
2010-08-06 18:54:22 -07:00
Steve Howard
f0857005b2 am db86c59e: New drawables for the update to the maps API (DO NOT MERGE)
Merge commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d' into gingerbread-plus-aosp

* commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d':
  New drawables for the update to the maps API (DO NOT MERGE)
2010-08-06 18:54:13 -07:00