26512 Commits

Author SHA1 Message Date
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
Robert Ly
8ef63e8bf0 am f9a71640: am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package"
Merge commit 'f9a71640b8ffa1dd1c727f7dd5f33e710dc31c49'

* commit 'f9a71640b8ffa1dd1c727f7dd5f33e710dc31c49':
  docchange: fixed typo "Pacskage" to "Package"
2010-07-12 15:14:32 -07:00
Robert Ly
f9a71640b8 am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package"
Merge commit 'b10080106909fd860ed33ac46de9f2f084e358d6' into gingerbread-plus-aosp

* commit 'b10080106909fd860ed33ac46de9f2f084e358d6':
  docchange: fixed typo "Pacskage" to "Package"
2010-07-12 15:11:25 -07:00
Robert Ly
b100801069 am ef13d028: docchange: fixed typo "Pacskage" to "Package"
Merge commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f' into gingerbread

* commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f':
  docchange: fixed typo "Pacskage" to "Package"
2010-07-12 15:07:40 -07:00
Robert Ly
ef13d02821 docchange: fixed typo "Pacskage" to "Package"
Change-Id: I6004dc7743dcd74315cbfc2cccc306ff8724e569
2010-07-12 14:55:59 -07:00
Romain Guy
260e102162 Optimize shader binding changes.
This change also cleans up the internal API a little bit by using mat4
everywhere instead of float[16] (for the ortho matrix for instance.)

Change-Id: I35924c7dc17bad17f30307118d5ed437c2ed37e0
2010-07-12 14:43:40 -07:00
Romain Guy
d12315ae7e Merge "Remove math from the vertex shader." 2010-07-12 14:17:16 -07:00
David Brown
77ad5e6411 am 523959f5: am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread
Merge commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc'

* commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc':
  Deprecate some status bar icons that now come from the phone app (and
2010-07-12 13:35:49 -07:00
David Brown
523959f50e am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread
Merge commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540' into gingerbread-plus-aosp

* commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540':
  Deprecate some status bar icons that now come from the phone app (and
2010-07-12 13:32:54 -07:00
David Brown
d1af902c21 Merge "Deprecate some status bar icons that now come from the phone app (and shouldn't have been public in the first place.)" into gingerbread 2010-07-12 13:30:58 -07:00
Jason Sams
93bab39af5 gl perf test cleanup.
Change-Id: Ic486774e25421bd2f412f0ba2bbac4660e3982b8
2010-07-12 11:59:34 -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
Kenny Root
f27c6c1001 am ceb8465e: am 87bb1857: Merge changes I2337051b,I19b426cb into gingerbread
Merge commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97'

* commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97':
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
2010-07-12 11:22:45 -07:00
Kenny Root
ceb8465e97 am 87bb1857: Merge changes I2337051b,I19b426cb into gingerbread
Merge commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd' into gingerbread-plus-aosp

* commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd':
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
2010-07-12 11:20:04 -07:00
Kenny Root
87bb18579a Merge changes I2337051b,I19b426cb into gingerbread
* changes:
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
2010-07-12 11:18:34 -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
Tadashi G. Takaoka
19046b0185 Merge "Fix that setInputMethod throw exception with wrong method id" 2010-07-12 10:41:08 -07:00
Maksymilian Osowski
7ee78150f7 Merge "Added dialogs to the DirListActivity." 2010-07-12 10:40:15 -07:00
Patrick Dubroy
5d1409191e Convert the minWidth and minHeight to device units when calling getInstalledProviders 2010-07-12 10:29:30 -07:00
Steve Block
cefd8d9588 Merge "Update DumpRenderTree to look in platform/android for Android-specific results" 2010-07-12 10:01:50 -07:00
Tadashi G. Takaoka
d88390f522 Fix that setInputMethod throw exception with wrong method id
Change-Id: I8dd9549bbdcba6fb590225f64c82cc9f498435ea
2010-07-12 10:01:37 -07:00
Steve Block
a88837573e Update DumpRenderTree to look in platform/android for Android-specific results
Change-Id: I32044fc8e22d419762e275cd69b0c785a7f4c8a5
2010-07-12 18:00:34 +01: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
Andy McFadden
731e7940d2 Merge "Fix build." 2010-07-12 09:19:05 -07:00
Andy McFadden
35620f5803 Fix build.
Added missing #include <string.h>.

Change-Id: Idf151876851110098fe538a042f896784821919b
2010-07-12 09:17:13 -07:00
Kenny Root
87315aa1f0 Tweak ObbFile class
* Move error messages around to clarify the errors.

* Add extra error check when reading a file.

* Seek to the end of a file when writing the signature so the users of
  the API don't have to remember to do it.

Change-Id: I2337051b9f9fa8147c5900237deec790dcd92436
2010-07-12 09:11:24 -07:00
Elliott Slaughter
b48fdbe792 Browser save page as web archive.
Change-Id: Id34a93b2e9bb6c185338989d1eeb6929d0bd06c5
2010-07-12 09:06:10 -07:00
Kenny Root
e059b2784f Allow things that can install packages to set Obb paths
Change-Id: I19b426cb3de1a5c9285badf8aea59989568914b4
2010-07-12 08:36:21 -07:00
Maksymilian Osowski
cc483d25b9 Added dialogs to the DirListActivity.
- A run/abort dialog on long click on directory
- A delayed progress dialog for directories that take long to load

Change-Id: I2fda245a48cb09faf8228809f7b091a7d2383589
2010-07-12 13:14:43 +01: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
Romain Guy
0b9db91c3d Remove math from the vertex shader.
Change-Id: I02847a60a8734bf8b3d29ec12e76297795095e38
2010-07-09 18:53:25 -07: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
d63c5d4e93 am bbf0bde5: am faccac76: Make a stupid thing about the glue less stupid.
Merge commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7'

* commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7':
  Make a stupid thing about the glue less stupid.
2010-07-09 18:30:22 -07:00
Dianne Hackborn
bbf0bde5d8 am faccac76: Make a stupid thing about the glue less stupid.
Merge commit 'faccac7616795859af257777900db514d425a106' into gingerbread-plus-aosp

* commit 'faccac7616795859af257777900db514d425a106':
  Make a stupid thing about the glue less stupid.
2010-07-09 18:27:51 -07:00
Dianne Hackborn
faccac7616 Make a stupid thing about the glue less stupid.
There is no reason to make the app developer delete the
glue.  Seriously.

Change-Id: Ic6a93ba17b44889783b35a2a0a2b67ffcd647f47
2010-07-09 18:20:09 -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
Romain Guy
4670268f47 Merge "Fix alpha blending and improve fragment shaders performance." 2010-07-09 16:15:35 -07:00
Romain Guy
16202fc974 Fix alpha blending and improve fragment shaders performance.
Change-Id: Ib74f6941d25ca6f6a41708e541174eaa7e8d9bc2
2010-07-09 16:13:28 -07:00
David Brown
26c679751d Deprecate some status bar icons that now come from the phone app (and
shouldn't have been public in the first place.)

(And since the changed deprecation state is a public API change, I needed
to do "make update-api" as well.)

Change-Id: I803d5a81ad2363561137be5af4f2b8258df758cd
2010-07-09 16:01:25 -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