summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix bug where LoaderManager instances were not being removed."Dianne Hackborn2010-07-131-0/+1
|\
| * Fix bug where LoaderManager instances were not being removed.Dianne Hackborn2010-07-131-0/+1
| | | | | | | | Change-Id: Ic8385ff60623ecd3e9fe8ff4360aef2c3b11f24f
* | Action Bar now supports submenus as popups.Adam Powell2010-07-131-1/+14
| | | | | | | | Change-Id: I1691c16081b3474ed6d6e406f91f5f74a2dc8fcb
* | am 89ee578b: am fd035829: Add initial gamepad support.Jeff Brown2010-07-131-0/+16
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '89ee578b7053d27a50922f82feb94bf6054b330c' * commit '89ee578b7053d27a50922f82feb94bf6054b330c': Add initial gamepad support.
| * \ am fd035829: Add initial gamepad support.Jeff Brown2010-07-131-0/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fd03582995e0fce963dd0fa0669e3211b74c0dd7' into gingerbread-plus-aosp * commit 'fd03582995e0fce963dd0fa0669e3211b74c0dd7': Add initial gamepad support.
| | * | Add initial gamepad support.Jeff Brown2010-07-131-0/+16
| | | | | | | | | | | | | | | | Change-Id: I0439648f6eb5405f200e4223c915eb3a418b32b9
* | | | Merge "Cosmetic changes around TextView."Gilles Debunne2010-07-134-7/+7
|\ \ \ \
| * | | | Cosmetic changes around TextView.Gilles Debunne2010-07-134-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some warnings in the code. Change-Id: Id19395031a1ab41edcc47e3dc8cd9479c6e19f83
* | | | | Double and one and a half tap removed from TextView.Gilles Debunne2010-07-131-231/+35
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text selection is now triggered by a long press. This behavior should be shared across applications and is already implemented in the browser. New UI guidelines say that double tap should be used for zooming only. Change-Id: I9fae692cf3f6e565350f666fa3d5a86884439349
* | | | am 47b46648: am b8d890eb: Merge "Initial implementation of the download ↵Steve Howard2010-07-133-0/+741
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | manager public API." into gingerbread Merge commit '47b46648b5a9b8c518b96db37618fc49c5e5f2d1' * commit '47b46648b5a9b8c518b96db37618fc49c5e5f2d1': Initial implementation of the download manager public API.
| * | | am b8d890eb: Merge "Initial implementation of the download manager public ↵Steve Howard2010-07-133-0/+741
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | API." into gingerbread Merge commit 'b8d890ebc1923d98d19d24f396442c91eb766b16' into gingerbread-plus-aosp * commit 'b8d890ebc1923d98d19d24f396442c91eb766b16': Initial implementation of the download manager public API.
| | * | Initial implementation of the download manager public API.Steve Howard2010-07-133-0/+741
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation is in android.net.DownloadManager, which is obtained through Context.getSystemService(). Right now this class acts as a simple wrapper on top of the existing DownloadProvider, exposing a simple interface to a subset of DownloadProvider's functionality. There are several TODOs for features that require changes to the underlying download manager implementation. Change-Id: I2f26e51b60b6e82af8478ac7ccd895667df095b6
* | | | Merge "Allow "am" to initiate heap dumps."Andy McFadden2010-07-136-5/+126
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow "am" to initiate heap dumps.Andy McFadden2010-07-126-5/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was mostly cloned from the "am profile" implementation. It's intended to replace the old "kill -10" approach used by "runhat". We could really use a native heap dump, so I pass a "managed" flag through that indicates whether we want to dump the native or managed heap. We don't currently have a native heap dump-to-file function, so it currently just logs a warning. (android.ddm.DdmHandleNativeHeap.getLeakInfo is a good start -- it copies /proc/maps and then calls get_malloc_leak_info to get some goodies. Needs some formatting to make it human-readable. I didn't want to cram all that into this change.) It would be useful if "am" didn't exit until the heap dump operation completed, but I'm not sure how to do that. Bug 2759474. Change-Id: I46bc98067738d8c72ac0fc10002ca67bb4929271
* | | | Merge "Selection handlers in TextView"Gilles Debunne2010-07-132-161/+488
|\ \ \ \
| * | | | Selection handlers in TextViewGilles Debunne2010-07-122-161/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long press on text view triggers selection mode. Two handles can be used to adjust selection. Change-Id: I45bb5fd62cae910570cff34920e45c4383160179
* | | | | Merge "Correctly support pre-multiplied alpha, optimizations, more stuff."Romain Guy2010-07-121-6/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Correctly support pre-multiplied alpha, optimizations, more stuff.Romain Guy2010-07-121-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Some improvements to ListFragment.Dianne Hackborn2010-07-122-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Take care of hiding/showing list automatically for normal behavior. - Make list_content public for others to use. Change-Id: Iecb7b70775d390d4e28e5c0dd6ba7278581b2734
* | | | | Merge "Change Javadoc to get around brokenness"Kenny Root2010-07-121-1/+1
|\ \ \ \ \
| * | | | | Change Javadoc to get around brokennessKenny Root2010-07-121-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am b65d2256: merge from open-source masterThe Android Open Source Project2010-07-121-11/+11
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b65d225633d14326d1ba2af862861e92d7ea45bc' * commit 'b65d225633d14326d1ba2af862861e92d7ea45bc': Reduced Warnings by adding Type Arguments and removing unused imports
| * | | | merge from open-source masterThe Android Open Source Project2010-07-121-11/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I992e2a407b1d8f7f29cb7153d4c2e3945e60b57a
| | * \ \ \ Merge "Reduced Warnings by adding Type Arguments and removing unused imports"Jean-Baptiste Queru2010-07-121-11/+11
| | |\ \ \ \
| | | * | | | Reduced Warnings by adding Type Arguments and removing unused importsChristian Mehlmauer2010-06-251-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42f8f9f9a6a6b271eaeb1a02f6d6567a630936ea
* | | | | | | am 6fb70b5a: merge from open-source masterThe Android Open Source Project2010-07-121-45/+45
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Merge commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9' * commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9': Documentation Bug (Issue 9557)
| * | | | | merge from open-source masterThe Android Open Source Project2010-07-121-45/+45
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: Ib01b5c62c229817b6620692a8ae0211230813899
| | * | | | Merge "Documentation Bug (Issue 9557)"Jean-Baptiste Queru2010-07-121-45/+45
| | |\ \ \ \
| | | * | | | Documentation Bug (Issue 9557)Christian Mehlmauer2010-07-061-45/+45
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an issue in the Time.toMillis example. Also removed some whitespaces so the file applies to the Android coding Styleguide Change-Id: Ic1383e506b30ff181c6e14a12f675b52e5c8ccbc
* | | | | | Merge "Convert the minWidth and minHeight to device units when calling ↵Patrick Dubroy2010-07-121-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | getInstalledProviders"
| * | | | | | Convert the minWidth and minHeight to device units when calling ↵Patrick Dubroy2010-07-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | getInstalledProviders
* | | | | | | Integrate host to device file transfer with the media provider.Mike Lockwood2010-07-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Merge "MediaProvider: Add constants for media_table and media_id columns in ↵Mike Lockwood2010-07-121-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | MTP objects table"
| * | | | | | MediaProvider: Add constants for media_table and media_id columns in MTP ↵Mike Lockwood2010-07-101-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | objects table Change-Id: I47396c637e483ea9c71bbb22898d69cb3d00b256 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Browser save page as web archive.Elliott Slaughter2010-07-124-1/+84
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Change-Id: Id34a93b2e9bb6c185338989d1eeb6929d0bd06c5
* | | | | | Implement instance passing in LoaderManager.Dianne Hackborn2010-07-094-79/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activity now propagates loaders across instances when retaining state. Adjusted APIs to make it better for apps to deal with this. Change-Id: I8a6448cff1132e66207f9223eb29ccfc0decf2ca
* | | | | | am b14f325a: am 289b9b62: Add ANativeWindow API for directly drawing to the ↵Dianne Hackborn2010-07-091-3/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surface bits. Merge commit 'b14f325a0118ffce286155caaabaae149653462c' * commit 'b14f325a0118ffce286155caaabaae149653462c': Add ANativeWindow API for directly drawing to the surface bits.
| * | | | | am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.Dianne Hackborn2010-07-091-3/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '289b9b62372ef52a06113b83dfb870e2c2fb325a' into gingerbread-plus-aosp * commit '289b9b62372ef52a06113b83dfb870e2c2fb325a': Add ANativeWindow API for directly drawing to the surface bits.
| | * | | | Add ANativeWindow API for directly drawing to the surface bits.Dianne Hackborn2010-07-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "New cursor controller in TextViews."Gilles Debunne2010-07-094-51/+364
|\ \ \ \ \ \
| * | | | | | New cursor controller in TextViews.Gilles Debunne2010-07-094-51/+364
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Editable TextView now display a cursor controller under the insertion point so that it can be precisely moved. Change-Id: Ia2e6ddc57d249647ff6683e10e4226db3df27223
* | | | | | am 0260887c: merge from open-source masterThe Android Open Source Project2010-07-091-42/+39
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | Merge commit '0260887ca78330b8dd7009d91859925df94a69d6' * commit '0260887ca78330b8dd7009d91859925df94a69d6': Improved logging when there's an error creating the directories in getFilesDir()
| * | | | merge from open-source masterThe Android Open Source Project2010-07-091-42/+39
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
| | * | | Improved logging when there's an error creating the directories in getFilesDir()Christian Mehlmauer2010-06-251-42/+39
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved logging when there's an error creating the directories in getFilesDir(); Due to mkdirs() only returns false on errors, it's better to output the directory path so the dev knows the path that can not be created See also Issue 8886 http://code.google.com/p/android/issues/detail?id=8886 Change-Id: I44d6adc8508ef9ca57f000b5d7bceeb0cfa3ed13
| * | | am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather ↵Jason Parks2010-07-082-32/+31
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Change CursorTreeAdapter to close the cursors rather than deactivating them. ↵Jason Parks2010-07-082-32/+31
| | | | | | | | | | | | | | | | | | | | | | | | Fix SimpleCursorTreeAdapter to allow a null cursor as an argument. Not closing the cursors was a bit of a bug since the documenation explicitly says that it would close the cursors. This will get rid of all the warnings that are printed out in the finalizer about the cursor not being closed.
* | | | Merge "reduce locking when using SQLiteStatement"Vasu Nori2010-07-092-78/+147
|\ \ \ \
| * | | | reduce locking when using SQLiteStatementVasu Nori2010-07-092-78/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Avoid unnecessary tests when drawing ListView dividers.Romain Guy2010-07-091-16/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: I5f2797ee92f5e3ed01eab0cf7f2acfe436b0c595
* | | | | Merge "Remove support for density compatibility in the hardware renderer."Romain Guy2010-07-094-40/+20
|\ \ \ \ \