summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix stickiness issues with UInicolasroard2013-04-011-9/+11
| | | | | | | | The renderGeometryIcon() function shouldn't be synchronized -- it's independent of the rest of the pipeline and is only used to apply a given geometry. Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3
* Don't try freeing resources on a different thread..nicolasroard2013-04-011-1/+0
| | | | | | | | | This call to freeResources happens on the main thread. It's also not really useful. The geometry instance shouldn't be shared either. bug:8522497 Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4
* Changed editor back button behavior.Ruben Brunk2013-04-011-7/+2
| | | | | Bug: 8522150 Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b
* Merge "Change panels organization. Also fixes border updates handling." into ↵Ruben Brunk2013-04-023-12/+40
|\ | | | | | | gb-ub-photos-bryce
| * Change panels organization. Also fixes border updates handling.Ruben Brunk2013-04-013-12/+40
| | | | | | | | Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
* | Merge "Pie design update" into gb-ub-photos-bryceMichael Kolb2013-04-018-153/+343
|\ \ | |/ |/|
| * Pie design updateMichael Kolb2013-04-018-153/+343
| | | | | | | | Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
* | Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryceAngus Kong2013-04-011-4/+14
|\ \
| * | Handle InterruptedException in waitDoneAngus Kong2013-04-011-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | Dirty bit for mParameters should be set properly if getParameters is not finished. bug:8517092 Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0
* | | Merge "Added apply UI callbacks for rotate/mirror operations." into ↵Ruben Brunk2013-04-014-1/+59
|\ \ \ | |/ / |/| | | | | gb-ub-photos-bryce
| * | Added apply UI callbacks for rotate/mirror operations.Ruben Brunk2013-04-014-1/+59
| | | | | | | | | | | | Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640
* | | Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryceAngus Kong2013-04-011-41/+27
|\ \ \
| * | | Don't use SynchronousQueue to pass results.Angus Kong2013-04-011-41/+27
| | |/ | |/| | | | | | | | | | bug:8517092 Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d
* | | Merge "Usage statistics for camera settings" into gb-ub-photos-bryceBobby Georgescu2013-04-011-3/+4
|\ \ \
| * | | Usage statistics for camera settingsBobby Georgescu2013-04-011-3/+4
| |/ / | | | | | | | | | Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647
* / / Enforce bmp type in pool, handle MTP image decode failureBobby Georgescu2013-04-012-6/+22
|/ / | | | | | | | | | | | | | | | | | | | | | | | | - GalleryBitmapPool didn't reject bitmap types other than ARGB_8888 which could lead to problems when a different type is used for recycling. - BitmapFactory throws an exception rather than returning null when image decoding fails and an existing bitmap was supplied for recycling, even if the failure was not caused by the use of that bitmap. When decoding things from an MTP device, we need to handle this since unsupported formats may be returned. Change-Id: I8cc8aa46f5a741b360e806814991f74a131e9039
* | Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryceAngus Kong2013-04-011-1/+1
|\ \
| * | Fix NPE when reconnecting camera.Angus Kong2013-04-011-1/+1
| |/ | | | | | | | | bug:8513852 Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
* | Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryceBobby Georgescu2013-04-013-15/+35
|\ \ | |/ |/|
| * Preliminary Album grid header in new galleryBobby Georgescu2013-04-013-15/+35
| | | | | | | | Change-Id: I90942de920795aedc5475f23cc3ede459949cc16
* | Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into ↵George Mount2013-04-014-75/+73
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Remove ImageCache from PhotoProvider in favor of MediaCache.George Mount2013-03-294-75/+73
| | | | | | | | | | | | Change-Id: I4e75a094d1dc033ac892c2b95bdc6b6a4a165304
* | | Merge "Fix double-tap behaviour" into gb-ub-photos-brycenicolasroard2013-03-302-1/+12
|\ \ \
| * | | Fix double-tap behaviournicolasroard2013-03-302-1/+12
| | | | | | | | | | | | | | | | Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e
* | | | Fixes some state synchronization issuesnicolasroard2013-03-302-7/+5
|/ / / | | | | | | | | | Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
* | | Merge "Implements progressive rendering" into gb-ub-photos-brycenicolasroard2013-03-307-34/+165
|\ \ \
| * | | Implements progressive renderingnicolasroard2013-03-297-34/+165
| | | | | | | | | | | | | | | | Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf
* | | | Merge "Added "discard unsaved changes" behavior for exiting." into ↵Ruben Brunk2013-03-301-15/+47
|\ \ \ \ | |_|/ / |/| | | | | | | gb-ub-photos-bryce
| * | | Added "discard unsaved changes" behavior for exiting.Ruben Brunk2013-03-291-15/+47
| | |/ | |/| | | | | | | | | | Bug: 7534778 Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac
* | | Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryceGeorge Mount2013-03-296-3/+1300
|\ \ \ | |_|/ |/| |
| * | Add initial implementation of MediaCache.George Mount2013-03-296-3/+1300
| | | | | | | | | | | | Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b
* | | Merge "add flexable ui for parameters" into gb-ub-photos-bryceJohn Hoford2013-03-2913-17/+645
|\ \ \ | |_|/ |/| |
| * | add flexable ui for parametersJohn Hoford2013-03-2913-17/+645
| | | | | | | | | | | | Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921
* | | Merge "Make camera releasing synchronous." into gb-ub-photos-bryceMichael Kolb2013-03-291-0/+3
|\ \ \
| * | | Make camera releasing synchronous.Angus Kong2013-03-281-0/+3
| | | | | | | | | | | | | | | | | | | | bug:8502943 Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
* | | | Merge "Re-enable caching step in RS filters" into gb-ub-photos-brycenicolasroard2013-03-293-12/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | Re-enable caching step in RS filtersnicolasroard2013-03-283-12/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 With the compatibility library, different Scripts instances actually points to the same thing. We thus need to explicitely rebind all the variables to the correct script instance before running RS filters... Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b
* / / Add HeaderGridView implementationBobby Georgescu2013-03-281-0/+466
|/ / | | | | | | Change-Id: Id0e699be0e40310c4919a9d55503edb9b07d4b58
* | Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryceDoris Liu2013-03-282-1/+7
|\ \
| * | Disable preview gestures when shutter is pressedDoris Liu2013-03-272-1/+7
| | | | | | | | | | | | | | | Bug:8333662 Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
* | | Fix deadlock.nicolasroard2013-03-273-172/+201
| | | | | | | | | | | | | | | | | | | | | Move the RenderScript context and Resources to CachingPipeline. bug:8491107 Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d
* | | Merge "Fixed renderscript crashes." into gb-ub-photos-bryceRuben Brunk2013-03-281-7/+4
|\ \ \
| * | | Fixed renderscript crashes.Ruben Brunk2013-03-271-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 createFilter() initializes a ton of parameters in the RenderScript filters. Using stale parameters from a previous call to createFilter() causes segfaults. Change-Id: Id54b956b7fe83be5089b1d47c3bedcca66237ddf
* | | | Merge "Make camera calls asynchronous" into gb-ub-photos-bryceAngus Kong2013-03-273-107/+112
|\ \ \ \ | |_|/ / |/| | |
| * | | Make camera calls asynchronousAngus Kong2013-03-273-107/+112
| | | | | | | | | | | | | | | | | | | | | | | | bug:8438047 Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
* | | | Merge "Workaround for switcher popup being cut off on ICS" into ↵Doris Liu2013-03-271-0/+2
|\ \ \ \ | |_|/ / |/| | | | | | | gb-ub-photos-bryce
| * | | Workaround for switcher popup being cut off on ICSDoris Liu2013-03-271-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: 8390375 Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d
* | | | Merge "Moves ownership of the environment to the pipeline" into ↵nicolasroard2013-03-277-246/+64
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-bryce
| * | | | Moves ownership of the environment to the pipelinenicolasroard2013-03-267-246/+64
| | |_|/ | |/| | | | | | | | | | Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
* | | | Remove debug log.Angus Kong2013-03-261-1/+0
| |_|/ |/| | | | | | | | Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43