Commit Graph

8948 Commits

Author SHA1 Message Date
Dianne Hackborn
ef69fb82db Fix bug where LoaderManager instances were not being removed.
Change-Id: Ic8385ff60623ecd3e9fe8ff4360aef2c3b11f24f
2010-07-13 18:38:46 -07:00
Gilles Debunne
8b451fcc84 Merge "Selection handlers in TextView" 2010-07-13 09:46:41 -07:00
Romain Guy
c7f3ce8401 Merge "Correctly support pre-multiplied alpha, optimizations, more stuff." 2010-07-12 20:23:03 -07:00
Romain Guy
6926c72e25 Correctly support pre-multiplied alpha, optimizations, more stuff.
Add support for the following drawing functions:
- drawBitmap(int[]...)
- drawPaint()

Optimizes shader state changes by enabling/disabling attribute arrays
only when needed.

Adds quick rejects when drawing trivial shapes to avoid unnecessary
OpenGL operations.

Change-Id: Ic2c6c2ed1523d08a63a8c95601a1ec40b6c7fbc9
2010-07-12 20:20:03 -07:00
Gilles Debunne
05336274dd Selection handlers in TextView
Long press on text view triggers selection mode. Two handles can be used to
adjust selection.

Change-Id: I45bb5fd62cae910570cff34920e45c4383160179
2010-07-12 18:45:40 -07:00
Dianne Hackborn
ef769f6e48 Some improvements to ListFragment.
- Take care of hiding/showing list automatically for normal behavior.
- Make list_content public for others to use.

Change-Id: Iecb7b70775d390d4e28e5c0dd6ba7278581b2734
2010-07-12 17:45:51 -07:00
Kenny Root
8335619363 Merge "Change Javadoc to get around brokenness" 2010-07-12 17:13:48 -07:00
The Android Open Source Project
b812925aee am b65d2256: merge from open-source master
Merge commit 'b65d225633d14326d1ba2af862861e92d7ea45bc'

* commit 'b65d225633d14326d1ba2af862861e92d7ea45bc':
  Reduced Warnings by adding Type Arguments and removing unused imports
2010-07-12 15:30:04 -07:00
The Android Open Source Project
b65d225633 merge from open-source master
Change-Id: I992e2a407b1d8f7f29cb7153d4c2e3945e60b57a
2010-07-12 15:26:21 -07:00
The Android Open Source Project
2f42aa54b4 am 6fb70b5a: merge from open-source master
Merge commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9'

* commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9':
  Documentation Bug (Issue 9557)
2010-07-12 15:24:45 -07:00
The Android Open Source Project
6fb70b5a9f merge from open-source master
Change-Id: Ib01b5c62c229817b6620692a8ae0211230813899
2010-07-12 15:21:50 -07:00
Kenny Root
622b3dc4a9 Change Javadoc to get around brokenness
Apparently the Javadoc we're using can't handle generic method
arguments, so remove the argument specification to let the compiler
match the right one since we're not overloading that method anyway.

Change-Id: Ie1a1a28c6e3c5fe5d2d434ecc66519e514bc692c
2010-07-12 14:20:14 -07:00
Patrick Dubroy
5958091dd9 Merge "Convert the minWidth and minHeight to device units when calling getInstalledProviders" 2010-07-12 11:40:58 -07:00
Mike Lockwood
d815f79766 Integrate host to device file transfer with the media provider.
MTP file transfers happen in two stages.  The SendObjectInfo command sends
some information about the file and reserves an ObjectHandle for the new file.
The file transfer is then performed using the SendObject command.

To support this in the media provider, MtpDatabase.beginSendObject receives
the information from SendObjectInfo and creates an row for it in the MTP objects
table for the new file.  After the file transfer has completed, then
MtpDatabase.endSendObject is called.  In endSendObject, we run the media scanner
on the new file, which will add a row to the images, audio, video
or audio playlist table.

To avoid the media scanner creating a second row for the file in the MTP objects
table, we pass the ObjectHandle created in beginSendObject to the media scanner,
which then passes it to the media provider via the content values when it
performs its insert.

Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-12 14:01:22 -04:00
Jean-Baptiste Queru
f0565ce75a Merge "Reduced Warnings by adding Type Arguments and removing unused imports" 2010-07-12 10:54:11 -07:00
Jean-Baptiste Queru
ac95a25409 Merge "Documentation Bug (Issue 9557)" 2010-07-12 10:43:17 -07:00
Patrick Dubroy
5d1409191e Convert the minWidth and minHeight to device units when calling getInstalledProviders 2010-07-12 10:29:30 -07:00
Mike Lockwood
12e807fb67 Merge "MediaProvider: Add constants for media_table and media_id columns in MTP objects table" 2010-07-12 09:54:32 -07:00
Elliott Slaughter
b48fdbe792 Browser save page as web archive.
Change-Id: Id34a93b2e9bb6c185338989d1eeb6929d0bd06c5
2010-07-12 09:06:10 -07:00
Mike Lockwood
fed161799b MediaProvider: Add constants for media_table and media_id columns in MTP objects table
Change-Id: I47396c637e483ea9c71bbb22898d69cb3d00b256
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-10 08:25:57 -04:00
Dianne Hackborn
2707d60262 Implement instance passing in LoaderManager.
Activity now propagates loaders across instances when retaining
state.  Adjusted APIs to make it better for apps to deal with this.

Change-Id: I8a6448cff1132e66207f9223eb29ccfc0decf2ca
2010-07-09 18:43:34 -07:00
Dianne Hackborn
8445ca6c3b am b14f325a: am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.
Merge commit 'b14f325a0118ffce286155caaabaae149653462c'

* commit 'b14f325a0118ffce286155caaabaae149653462c':
  Add ANativeWindow API for directly drawing to the surface bits.
2010-07-09 17:05:23 -07:00
Dianne Hackborn
b14f325a01 am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.
Merge commit '289b9b62372ef52a06113b83dfb870e2c2fb325a' into gingerbread-plus-aosp

* commit '289b9b62372ef52a06113b83dfb870e2c2fb325a':
  Add ANativeWindow API for directly drawing to the surface bits.
2010-07-09 17:03:14 -07:00
Dianne Hackborn
289b9b6237 Add ANativeWindow API for directly drawing to the surface bits.
Also other cleanup and fixes:

- We now properly set the default window format to 565.
- New APIs to set the window format and flags from native code.
- Tweaked glue for simpler handling of the "destroy" message.
- Um, other stuff.

Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
2010-07-09 16:58:19 -07:00
Gilles Debunne
3a70b20ee5 Merge "New cursor controller in TextViews." 2010-07-09 16:22:30 -07:00
Gilles Debunne
cc3ec6cdb2 New cursor controller in TextViews.
Editable TextView now display a cursor controller under the insertion
point so that it can be precisely moved.

Change-Id: Ia2e6ddc57d249647ff6683e10e4226db3df27223
2010-07-09 16:20:21 -07:00
The Android Open Source Project
b92cd4fc63 am 0260887c: merge from open-source master
Merge commit '0260887ca78330b8dd7009d91859925df94a69d6'

* commit '0260887ca78330b8dd7009d91859925df94a69d6':
  Improved logging when there's an error creating the directories in getFilesDir()
2010-07-09 16:01:00 -07:00
The Android Open Source Project
0260887ca7 merge from open-source master
Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
2010-07-09 15:59:17 -07:00
Vasu Nori
187c7216d6 Merge "reduce locking when using SQLiteStatement" 2010-07-09 13:37:45 -07:00
Romain Guy
179de8a37c Avoid unnecessary tests when drawing ListView dividers.
Change-Id: I5f2797ee92f5e3ed01eab0cf7f2acfe436b0c595
2010-07-09 13:27:00 -07:00
Vasu Nori
e25539fdfd reduce locking when using SQLiteStatement
Do compiling of sql, binding of args and execution of the SQL
statement within one single database lock period.
This reduces the number of times the database lock
needs to be acquired during the course of compilation, binding
and execution of a SQLiteStatement.

Change-Id: I22b090ec9e10fc0aa2532a93bafe610af2546b58
2010-07-09 12:31:12 -07:00
Romain Guy
20030a6303 Merge "Remove support for density compatibility in the hardware renderer." 2010-07-09 10:39:32 -07:00
Romain Guy
dbd77cd444 Remove support for density compatibility in the hardware renderer.
Change-Id: I535e919986e5ccfb344ede8516ccd84c02642823
2010-07-09 10:36:05 -07:00
Grace Kloba
0fb624259e Merge "Combine base PictureSet with composite layers into one SkLayer tree to get ready for GL rendering." 2010-07-09 10:05:34 -07:00
Kenny Root
511d9ec363 am 0a21801f: am a5402dab: Merge "OBB API for PackageManager" into gingerbread
Merge commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b'

* commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b':
  OBB API for PackageManager
2010-07-08 19:09:06 -07:00
Jeff Brown
1a33274d28 resolved conflicts for merge of 167449e5 to master
Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67
2010-07-08 19:01:13 -07:00
Adam Powell
6f10db885f Merge "Fix some issues with smooth scrolling ListViews" 2010-07-08 18:39:42 -07:00
Dianne Hackborn
53c67c8dfd Fix build.
Change-Id: I60185df6150d13d704a28933bc919527da173307
2010-07-08 18:27:42 -07:00
Adam Powell
371133174b Fix some issues with smooth scrolling ListViews
Change-Id: I8b0f3d318eb0508ed12b92584c368e6f0edeb0be
2010-07-08 18:21:48 -07:00
Dianne Hackborn
c801768e4d Integrate Loader support in to Activity/Fragment.
Introduces a new LoaderManager class that takes care of
most of what LoaderManagingFragment does.  Every Fragment
and Activity can have one instance of this class.  In the
future, the instance will be retained across config changes.

Also various other cleanups and improvement.

Change-Id: I3dfb406dca46bda7f5acb3c722efcbfb8d0aa9ba
2010-07-08 15:17:22 -07:00
Grace Kloba
8abd50b748 Combine base PictureSet with composite layers into
one SkLayer tree to get ready for GL rendering.

Now UI holds its copy of SkLayer tree. The top node
is BaseLayerAndroid which has the PictureSet as its
content.

There is a matching change in external/webkit.
2010-07-08 15:02:14 -07:00
Mike Lockwood
2951c6d057 Merge "MTP: Use media provider database to implement MTP device support." 2010-07-08 14:29:59 -07:00
Vasu Nori
07e1b1dd16 Merge "reduce java locking on SQLiteDatabase if sql is already compiled" 2010-07-08 14:10:16 -07:00
Mike Lockwood
d21eac9c70 MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.

The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.

Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-08 16:21:09 -04:00
Romain Guy
26be805f42 Merge "Do not draw the fade areas when it's not necessary." 2010-07-08 12:54:25 -07:00
Vasu Nori
b2d2ddc5ac reduce java locking on SQLiteDatabase if sql is already compiled
Change-Id: I6c2c593ba69aad201cedf097384d0b5d835c0839
2010-07-08 12:53:22 -07:00
Romain Guy
dac5f9f3ca Do not draw the fade areas when it's not necessary.
Prior to this change, every singleLine TextView would create, draw
and compose a layer on every draw dispatch. This was unnecessary and
expensive.

Change-Id: Ia4f79d7fc8f485784fe6b795f0f196d38d579838
2010-07-08 12:52:25 -07:00
Jason Parks
49ff1e6c6c am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread
Merge commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f' into gingerbread-plus-aosp

* commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f':
  Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
2010-07-08 11:52:01 -07:00
Vasu Nori
a3dcc4cc7e Merge "STOPSHIP CL in master - make sqlite WAL default for all apps" 2010-07-08 11:43:24 -07:00
Vasu Nori
57feb5d9a7 STOPSHIP CL in master - make sqlite WAL default for all apps
for testing the sqlite WAL feature in the next few weeks.

Change-Id: I07234647b5e90d9e3bb0a5310b6cc449d58db428
2010-07-08 11:41:52 -07:00