summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove SkRegion dependency from libinputMichael Wright2014-02-104-11/+28
| | | | | | | | This gets us one step closer to removing our dependency on Skia, which is at least one of the things blocking us from moving the input system out of f/b. Change-Id: I755e6267996c93fe700f1056327386923287575a
* Add prototype for borderless touch feedback drawableAlan Viverette2014-02-054-2/+407
| | | | Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
* Merge "Global system setting to override certain window policy."John Spurlock2014-02-066-16/+285
|\
| * Global system setting to override certain window policy.John Spurlock2014-02-056-16/+285
| | | | | | | | | | | | | | | | | | Specifically, the ability to force immersive-mode-like behavior on the status bar, the navigation bar (or both) on a package-by-package basis - and to disable immersive mode confirmations for specific packages. Change-Id: I2df7092a91eceeb815367ef917dd7289f4f2b27e
* | Merge "Improve logging of first wake lock, history size."Dianne Hackborn2014-02-068-195/+313
|\ \
| * | Improve logging of first wake lock, history size.Dianne Hackborn2014-02-058-195/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now try to have a better label for the first wake lock that is acquired in the log. This is done in two ways: - The alarm manager now sorts the alarms it is going to execute so that wakeup alarms are first, which are more important w.r.t. which one should be logged. - There is a new power manager facility to make a wake lock as "unimportant for logging," which just means in battery stats that a wake lock acquired after that can be considered the actual one to log. This is only used by the alarm manager to mark its TIME_TICK alarms as unimportant for logging. Also reworked the battery history code to be cleaner and a bit smaller. There is no longer a separate EVENT command, instead the event code and tag are just another thing that can be included in an UPDATE command. The bits used in the first history int are also re-arrange, so that only the ones that really change a fair amount in the state bits are up at the top and there is no longer space used for the command code (since now it is always just UPDATE). This allows us to have more room for the time delta at the bottom, to better avoid situations where we need to write an int delta. Change-Id: I1bb860ae5b558a248800b090b03a84fbf7acd68a
* | | Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"Chong Zhang2014-02-063-23/+250
|\ \ \
| * | | MediaRecorderTest: add tests for getSurface() and SURFACE sourceChong Zhang2014-01-163-23/+250
| | | | | | | | | | | | | | | | | | | | Bug: 12305192 Change-Id: I2f63799219273dc84732ba3b7a9dceb84a1f27a7
* | | | Merge "Adds hotspot support to LayerDrawable and InsetDrawable"Alan Viverette2014-02-052-0/+84
|\ \ \ \
| * | | | Adds hotspot support to LayerDrawable and InsetDrawableAlan Viverette2014-02-052-0/+84
| | | | | | | | | | | | | | | | | | | | Change-Id: Id17f460c8e4e0a6bf9fd39a4a7b8c79fa2df8d29
* | | | | Merge "Temporary fix for background invalidation"Alan Viverette2014-02-052-12/+24
|\ \ \ \ \ | |/ / / /
| * | | | Temporary fix for background invalidationAlan Viverette2014-02-052-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not a complete solution, since we could be more efficient, but enough to have both background display lists and proper invalidation. Change-Id: I0216a104948c0930760275bb2b98318b0a4487e7
* | | | | Merge "Improve idle-service bind permission description"Christopher Tate2014-02-051-1/+1
|\ \ \ \ \
| * | | | | Improve idle-service bind permission descriptionChristopher Tate2014-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 12889390 Change-Id: I34dc22870f21a92895b8e214077885a80936d0d5
* | | | | | am 2c764b20: am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs ↵Chris Craik2014-02-051-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | within a bitmap" * commit '2c764b20e4a35c509f49e3d9430e135b4f3a0984': Fix for positioning of glyphs within a bitmap
| * \ \ \ \ \ am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"Chris Craik2014-02-051-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ec3ca6e08e5933016beda147ca9a82e96434b15': Fix for positioning of glyphs within a bitmap
| | * \ \ \ \ \ am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"Chris Craik2014-02-051-3/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '449273e2d575041ffe1a5d435666d36923de888b': Fix for positioning of glyphs within a bitmap
| | | * \ \ \ \ \ Merge "Fix for positioning of glyphs within a bitmap"Chris Craik2014-02-051-3/+3
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix for positioning of glyphs within a bitmapAlexander Toresson2014-01-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For positioning of glyphs within a bitmap, roundf(int + float) is used, where the float is the glyph position and the int is the text position. When the text position is varied, this may lead to the sum being rounded in different directions, due to floating point rounding, caused by that floating point numbers have different precision in different ranges. This may therefore lead to slightly different positioning for glyphs and therefore slightly different widths and heights for text strings, depending on the position they are rendered at. The solution in this patch is to use int + (int) roundf(float), which has consistent rounding, and also enables us to use the full range of ints. Change-Id: Id1143cdfcbdfa9915ced878ae04df589a3e03cee
* | | | | | | | | | Merge "Camera2: update aeLock and transform matrix tag specs"Zhijun He2014-02-052-10/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Camera2: update aeLock and transform matrix tag specsZhijun He2014-02-052-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I436f41ff2bf811a654de15b51739c07def354648
* | | | | | | | | | | Merge "Fix postUrl to call loadUrl when url is not a network url."Hui Shu2014-02-051-3/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix postUrl to call loadUrl when url is not a network url.Hui Shu2014-02-051-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4be00611c220572b4e8ecea1a00409a6f5d2bb18
* | | | | | | | | | | | Merge "android_media_MediaMuxer_setLocation: amended signature."Robert Shih2014-02-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI signature. Bug: 12890910 Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
* | | | | | | | | | | | | Merge "Using large file for download manager test."Maxim Siniavine2014-02-051-19/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Using large file for download manager test.Maxim Siniavine2014-02-041-19/+16
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should decrease the chance of the file being downloaded too quickly and confusing the test. Change-Id: I8f4debbb51798162493d6a8005e1aa142738dbd4
* | | | | | | | | | | | | Merge "Remove need for software layer drawing percentage text."John Spurlock2014-02-051-25/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove need for software layer drawing percentage text.John Spurlock2014-02-051-25/+26
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the text is transparent, use the same approach as the bolt to punch it through the rest of the shape - by first rendering the text into a path. When the text is opaque, draw the text on top as before. Change-Id: I50f201b1bf0f92164728e3237ec45e22eb788d52
* | | | | | | | | | | | | Merge "Camera2: Update stream num tag specs"Zhijun He2014-02-052-5/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Camera2: Update stream num tag specsZhijun He2014-02-052-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba6f1f8c779e5c3a622a7f07029f4373a887bffe
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-02-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-02-051-2/+2
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I388073346d1d4990f09c557f2d1a2bea49cee99d Auto-generated-cl: translation import
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-02-0556-9/+135
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-02-0556-9/+135
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2cedaf11af37d24aa50dbcf27da1b470de6f43a Auto-generated-cl: translation import
* | | | | | | | | | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made ↵Andreas Huber2014-02-0516-21/+705
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | available to media code"
| * | | | | | | | | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-0416-21/+705
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to media code Change-Id: I7f6cdcfd2a28846d36d89dd5180ef20a22b03af8
* | | | | | | | | | | | | Merge "Cache media/nomedia paths"Marco Nelissen2014-02-051-16/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Cache media/nomedia pathsMarco Nelissen2014-02-041-16/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking all the parents of every path for presence of a .nomedia file every time a new entry is inserted, build a cache of paths and use that when possible. Change-Id: I5b912fd54473db8f96d3511cbc2715e0b69dd16b
* | | | | | | | | | | | | | Merge "Revert "Camera2: Update stream num tag specs""Narayan Kamath2014-02-051-33/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "Camera2: Update stream num tag specs"Narayan Kamath2014-02-051-33/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 67c23833f81cb27671ee9f62a87ba810d0d49989. Change-Id: I3aa2d0b245c998c57f3312e2d6f68aa72d80c338
* | | | | | | | | | | | | | | Merge "Add new RIL commands to read/write NV items and reset NV config."Jake Hamby2014-02-0511-75/+236
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add new RIL commands to read/write NV items and reset NV config.Jake Hamby2014-02-0311-75/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new RIL commands and generic code cleanups. The only changes required for OMA DM support are the addition of five new methods in ITelephony.aidl for reading/writing NV items and performing NV config and radio resets (requires MODIFY_PHONE_STATE), along with the new RIL request IDs in RILConstants.java. Bug: 12864208 Change-Id: I958d2571580d98a49936ef2e6822e5ac086acbe2
* | | | | | | | | | | | | | | Merge "Import updated SearchView assets from UX"Adam Powell2014-02-0522-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Import updated SearchView assets from UXAdam Powell2014-02-0422-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 12233992 Change-Id: I6624d0d7625121a8905efa697c6a183b4463a289
* | | | | | | | | | | | | | | | am 34b84e69: am eadd6941: am bc80e40b: Merge "Add message to RS docs about ↵Stephen Hines2014-02-051-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application vs. library packaging." * commit '34b84e691c4d5bd853bc5b7c7ccb8040590359d6': Add message to RS docs about application vs. library packaging.
| * | | | | | | | | | | | | | am eadd6941: am bc80e40b: Merge "Add message to RS docs about application ↵Stephen Hines2014-02-051-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vs. library packaging." * commit 'eadd69413a5cbdd32ae56967f48b6ab6f3efbe52': Add message to RS docs about application vs. library packaging.
| | * | | | | | | | | | | | | am bc80e40b: Merge "Add message to RS docs about application vs. library ↵Stephen Hines2014-02-041-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packaging." * commit 'bc80e40b160596c262fee0ee4df4b9f15cc14e89': Add message to RS docs about application vs. library packaging.
| | | * | | | | | | | | | | | Merge "Add message to RS docs about application vs. library packaging."Stephen Hines2014-02-051-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Add message to RS docs about application vs. library packaging.Stephen Hines2014-01-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49b694629ded066e5ee9c1af29970c59cb637fdd