summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Usage statistics for photo and video captureBobby Georgescu2013-04-023-0/+14
| | | | | Bug: 8433834 Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
* 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-015-84/+82
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Remove ImageCache from PhotoProvider in favor of MediaCache.George Mount2013-03-295-84/+82
| | | | | | | | | | | | 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-298-3/+1698
|\ \ \ | |_|/ |/| |
| * | Add initial implementation of MediaCache.George Mount2013-03-298-3/+1698
| | | | | | | | | | | | 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
* | | Add GPSDirection tag using ExifInterface.Angus Kong2013-03-265-33/+129
|/ / | | | | | | | | bug:8115825 Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9
* | Hides popup indicator on some editorsnicolasroard2013-03-254-4/+30
| | | | | | | | Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae
* | Hides seekbar in some editorsnicolasroard2013-03-258-1/+47
|/ | | | Change-Id: Ifce385f9a6bf9b741f0873f49d826fbcf453d97c
* Merge "Adding switcher background back in" into gb-ub-photos-bryceDoris Liu2013-03-251-0/+64
|\
| * Adding switcher background back inDoris Liu2013-03-251-0/+64
| | | | | | | | | | | | | | Fixed switcher background's rotation issue. Bug: 8436031 Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938
* | Add album type to albums table.Mangesh Ghiware2013-03-252-1/+4
| | | | | | | | Change-Id: Ib4dfb1de9d814d2ee41c5b855b69f09115912e57
* | Refactoring: removed unnecessary apply calls.Ruben Brunk2013-03-229-100/+8
| | | | | | | | Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6
* | Fix NPE in CameraMichael Kolb2013-03-221-2/+6
| | | | | | | | | | | | Bug: 8409508 Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
* | Add renderers only onceMichael Kolb2013-03-221-2/+2
| | | | | | | | Change-Id: I819c0486d23e358d7d7b989a051da9087fa292a1
* | Fix problem applying the Fx filternicolasroard2013-03-215-10/+43
| | | | | | | | | | | | | | Also adds some debug info bug:8442036 Change-Id: Ife7fd4be664ae011e41969e74c7745da0a7a52f5
* | Merge "Revert "New loading model"" into gb-ub-photos-bryceJohn Reck2013-03-2226-306/+206
|\ \
| * | Revert "New loading model"John Reck2013-03-2126-306/+206
| | | | | | | | | | | | Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
* | | Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryceBobby Georgescu2013-03-219-219/+406
|\ \ \ | |/ / |/| |
| * | Refactor grid fragments in new galleryBobby Georgescu2013-03-209-219/+406
| |/ | | | | | | Change-Id: I087cd68ddf8a0a23547d85082f146b6effd68f22
* | Merge "Changes for CanvasProvider" into gb-ub-photos-bryceJohn Reck2013-03-211-1/+2
|\ \