summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Remove excessive logging.Wu-cheng Li2010-01-301-1/+1
| | | | bug:2346606
* Add focal length and view angle API.Wu-cheng Li2010-01-301-0/+33
| | | | bug:2375989,2375987
* Add Camera.getSupportedThumbnailSizes() and Size.equals().Wu-cheng Li2010-01-301-1/+35
| | | | bug:2375986
* Merge "Fix sample code insertion."Dianne Hackborn2010-01-292-8/+6
|\
| * Fix sample code insertion.Dianne Hackborn2010-01-292-8/+6
| |
* | am 3a8a2818: am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget ↵Jim Miller2010-01-291-2/+12
|\ \ | |/ |/| | | | | | | | | | | | | so we can reset it when we get an incoming call. Merge commit '3a8a28185bc26ccfdf847016d5a40af35436ca97' * commit '3a8a28185bc26ccfdf847016d5a40af35436ca97': Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
| * am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget so we can ↵Jim Miller2010-01-291-2/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | reset it when we get an incoming call. Merge commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c' into eclair-plus-aosp * commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c': Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
| | * Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we ↵Jim Miller2010-01-291-2/+12
| | | | | | | | | | | | | | | | | | get an incoming call. Updated javadoc.
* | | Merge "Fix SDK build."Dianne Hackborn2010-01-291-1/+1
|\ \ \
| * | | Fix SDK build.Dianne Hackborn2010-01-291-1/+1
| | | |
* | | | Merge "Adding system preferences for contacts: sort order and display order."Dmitri Plotnikov2010-01-291-2/+52
|\ \ \ \ | |/ / / |/| | |
| * | | Adding system preferences for contacts: sort order and display order.Dmitri Plotnikov2010-01-261-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We are using the system settings provider, but the preference UI is in the Contacts app for now. Change-Id: Iad840d131a4eb13bb745643b3c4b0234889d1202
* | | | More device policy work: clarify password modes, monkeying.Dianne Hackborn2010-01-297-61/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarifies what the password modes mean, renaming them to "quality" and updating their documentation and the implementation to follow. Also adds a facility to find out if a monkey is running, which I need for the api demo to avoid letting it wipe the device.
* | | | Merge "Apps on SD card project. Refactored recommendAppInstallLocation(..) ↵Oscar Montemayor2010-01-292-77/+89
|\ \ \ \ | | | | | | | | | | | | | | | method in PackageManager by making it an instance method. Since PackageManager has only abstarct instance methods, moved implementation to ApplicationContext.ApplicationPackageManager class, in line with the rest of the method implementations. Tah way, chage is consistent with best coding practices. Also MockPackageManager received the additional method."
| * | | | Apps on SD card project.Oscar Montemayor2010-01-292-77/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored recommendAppInstallLocation(..) method in PackageManager by making it an instance method. Since PackageManager has only abstarct instance methods, moved implementation to ApplicationContext.ApplicationPackageManager class, in line with the rest of the method implementations. Tah way, chage is consistent with best coding practices. Also MockPackageManager received the additional method.
* | | | | Merge "Phase 2 of test cleanup: moving test files from AndroidTests closer ↵Neal Nguyen2010-01-29143-5/+23751
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | to their sources."
| * | | | | Phase 2 of test cleanup: moving test files from AndroidTests closer to their ↵Neal Nguyen2010-01-29143-5/+23751
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sources. Most of these are file moves; a couple notable exceptions are the changes due to the move, and fixing up test code: - database/DatabaseCursorTest.java - database/DatabaseStatementTest.java - net/UriTest.java
* | | | | | Merge "Added dumpHprofDataDdms() call."Andy McFadden2010-01-292-1/+49
|\ \ \ \ \ \
| * | | | | | Added dumpHprofDataDdms() call.Andy McFadden2010-01-292-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a hidden dumpHprofDataDdms() method, which initiates an hprof dump that sends its data directly to DDMS.
* | | | | | | Fix build: javadoc @link pointers need HTML-style #refnameChristopher Tate2010-01-291-1/+1
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Change-Id: I0e061516fce2bcf5dea401f58180f2ff396482ab
* | | | | | Merge "Simplify the MemoryDealer implementation"Mathias Agopian2010-01-291-1/+1
|\ \ \ \ \ \
| * | | | | | Simplify the MemoryDealer implementationMathias Agopian2010-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some point the implementation became complicated because of SurfaceFlinger's special needs, since we are now relying on gralloc we can go back to much simpler MemoryDealer. Removed HeapInterface and AllocatorInterface, since those don't need to be paramterized anymore. Merged SimpleMemory and Allocation. Made SimplisticAllocator non virtual. Removed MemoryDealer flags (READ_ONLY, PAGE_ALIGNED) Removed a lot of unneeded code.
* | | | | | | Merge "Make backup/restore asynchronous and enforce timeouts"Chris Tate2010-01-294-18/+53
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Make backup/restore asynchronous and enforce timeoutsChristopher Tate2010-01-294-18/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callouts to app backup agents are now asynchronous, and timeouts are applied if they take too long, hang, etc. The initial timeouts are set to 15 seconds on backup, 60 seconds on restore. These operations typically run at background priority, so it's necessary to give them ample time to run. As part of setting up this asynchronicity, the Backup Manager's internal thread management has been overhauled. It now spins off a single HandlerThread at startup, and runs backup/restore/etc operations *synchronously* in that thread, applying timeouts as appropriate. This means we're no longer spinning up new threads all the time, and furthermore it ensures that we can never have more than one operation in flight at once. Later CLs will remove the now-redundant logic that previously ensured that operations didn't stomp on each other. Bug: 2053560 Change-Id: Ie4315c219c7ff6dd8f51f2ad6c0872595b18cff1
* | | | | | | Unhide ThumbnailUtils to support Camera unbundling.Ray Chen2010-01-291-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/2375978
* | | | | | | Merge "Implement the GL11ExtensionPack APIs."Jack Palevich2010-01-291-89/+943
|\ \ \ \ \ \ \
| * | | | | | | Implement the GL11ExtensionPack APIs.Jack Palevich2010-01-281-89/+943
| | | | | | | |
* | | | | | | | Merge "Support for triggering the lockscreen while the screen is on:"Mike Lockwood2010-01-292-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Support for triggering the lockscreen while the screen is on:Mike Lockwood2010-01-292-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new ALLOW_LOCK_WHILE_SCREEN_ON window manager flag, which when set causes the window manager to put up the lockscreen after the normal screen timeout has elapsed. Add plumbing to pass PowerManager.userActivity() to the window manager policy. Change-Id: I05adc52bad39c56031a08e8ec3cbcf5c2d9b9827 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | Merge "Add a method to IBackupTransport to get the current backup set token"Chris Tate2010-01-292-3/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add a method to IBackupTransport to get the current backup set tokenChristopher Tate2010-01-292-3/+22
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to specifically manage restores of last-known-good data generated from the current device during its normal provisioned lifetime.
* | | | | | | | Merge "Apps on SD card project. This class implements heuristics to ↵Oscar Montemayor2010-01-291-0/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | determine best app install location, without looking at the package flags (pre-parsing stage)."
| * | | | | | | | Apps on SD card project.Oscar Montemayor2010-01-281-0/+85
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This class implements heuristics to determine best app install location, without looking at the package flags (pre-parsing stage).
* | | | | | | | make SqliteDatabase ConflictAlgorithm and associated methods public.Vasu Nori2010-01-291-34/+27
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQLiteDatabase.java has ConflictAlgorithm which allows callers to specify actions to take when insert or update causes constraint violations. These actions are documented at http://www.sqlite.org/lang_conflict.html. why make these public? usecase is the following: Gmail has a table with a column "_id" being the integer primary key and they let sqlite assign key values to the column. but there is another UNIQUE key column (message_id) in the table. so an insert could fail due to constraint violation on the message_id column (i.e., not on the primary key). and when that happens, they would like to get the value of _id that caused constraint violation. currently hidden method insertOnConflict() already provides the above functionality. that means exposing ConflictAlgorithm also.
* | | | | | | Merge "Update search source selector assets"Bjorn Bringert2010-01-296-8/+12
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Update search source selector assetsBjorn Bringert2010-01-296-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id56e2ac195e1d1f8dcfe2fbe07025f3527396bba
* | | | | | | framework: os: Introduce IMountServiceObserverSan Mehat2010-01-292-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | | | | | Merge "New full-screen activity for USB mass storage interaction."Daniel Sandler2010-01-298-162/+229
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | New full-screen activity for USB mass storage interaction.Daniel Sandler2010-01-288-162/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still TODO: patch into forthcoming callbacks from MountService so the USB storage activity always shows the correct state of the device. (Right now it only refreshes its display onResume.) Bug: 2299129
* | | | | | | Merge "Don't bounce programmatic scrolls of ScrollView and ↵Adam Powell2010-01-282-8/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | HorizontalScrollView."
| * | | | | | | Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView.Adam Powell2010-01-282-8/+14
| | | | | | | |
* | | | | | | | Remove MMS from the frameworkTom Taylor2010-01-2833-9128/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MMS code has been moved into the mms-common library. Move SqliteWrapper (and make it hidden) into the database directory because Telephony.java depends on it. Create a mmscommon library similar to androidcommon for a number of files used both by the telephony layer, by mms, and by myfaves. Change-Id: I2e23e87c4961b87c42a4c8a63f812fa9e0e44dec
* | | | | | | resolved conflicts for merge of bb074ef9 to masterJean-Baptiste Queru2010-01-282-31/+60
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | Change-Id: I2d78d1280b56928f65517203348ddbd403fa9eae
| * | | | | | am 769ed21c: Fix http://b/issue?id=2400423.Grace Kloba2010-01-272-28/+56
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp * commit '769ed21c33c3629411eb3bbf924de45737a18067': Fix http://b/issue?id=2400423.
| | * | | | | Fix http://b/issue?id=2400423.Grace Kloba2010-01-272-28/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the same page is loaded, updateRestoreState will be false when we finish the first layout. As we are still in the same page, we don't want to update the current zoom/scroll. But in some cases, like a site switch from mobile to full site and keeps the same url, we do want to update the zoom range as the viewport spec changed. Otherwise, user can't zoom in the full site as the WebView thought it is still a mobile non-scalable page.
* | | | | | | am fbf977be: am 9985867a: Fix 2397617: Right-align carrier text in lock ↵Jim Miller2010-01-285-10/+26
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen and add carrier text to PINunlock in landscape mode. Merge commit 'fbf977be5471a81b664bfc0a048497f268688a17' * commit 'fbf977be5471a81b664bfc0a048497f268688a17': Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
| * | | | | am 9985867a: Fix 2397617: Right-align carrier text in lock screen and add ↵Jim Miller2010-01-265-10/+26
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | carrier text to PINunlock in landscape mode. Merge commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7' into eclair-plus-aosp * commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7': Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
| | * | | | Fix 2397617: Right-align carrier text in lock screen and add carrier text to ↵Jim Miller2010-01-265-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | PINunlock in landscape mode.
| * | | | | am f904be16: Merge "disable high-quality filtering during scrolling, until I ↵Mike Reed2010-01-251-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can cached the scaled images." into eclair Merge commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp * commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737': disable high-quality filtering during scrolling, until I can cached the scaled images.
| | * | | | Merge "disable high-quality filtering during scrolling, until I can cached ↵Mike Reed2010-01-251-1/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | the scaled images." into eclair