summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix bordersnicolasroard2013-02-078-41/+267
| | | | Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e
* Add todonicolasroard2013-02-071-0/+2
| | | | Change-Id: I54fd72da364337833f80a0f1913beadf2af74277
* Merge "Fix Fx filters" into gb-ub-photos-brycenicolasroard2013-02-087-20/+165
|\
| * Fix Fx filtersnicolasroard2013-02-077-20/+165
| | | | | | | | Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea
* | Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryceJohn Hoford2013-02-0711-358/+425
|\ \
| * | fix draw and curves to use FilterRepresentationJohn Hoford2013-02-0711-358/+425
| |/ | | | | | | Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349
* | Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryceDoris Liu2013-02-071-3/+4
|\ \ | |/ |/|
| * Fix memory leak in ComboPreferencesDoris Liu2013-02-071-3/+4
| | | | | | | | | | | | Bug: 8028546 Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185
* | Fix flashing on geometry previewnicolasroard2013-02-071-0/+1
| | | | | | | | Change-Id: I0f05d654c1c4373016d2d5766eb983a47fab2780
* | Fix filters only + geometry only renderingnicolasroard2013-02-076-138/+204
| | | | | | | | Change-Id: Id8f0637ae53864488cb931def196ee50ae807f5c
* | Refactor to use direct manipulations of FilterRepresentations.nicolasroard2013-02-0610-56/+124
| | | | | | | | Change-Id: If5f92f137283cb126835be004d315942ff95021c
* | fix editor visibilitynicolasroard2013-02-053-0/+6
| | | | | | | | Change-Id: I0c9c5273b49974884b8bdf365211b33de54c5598
* | Merge "Refactor filters parameters - introduce FilterRepresentations - ↵nicolasroard2013-02-0537-323/+657
|\ \ | | | | | | | | | change filters lifecycle" into gb-ub-photos-bryce
| * | Refactor filters parametersnicolasroard2013-02-0537-323/+657
| |/ | | | | | | | | | | | | - introduce FilterRepresentations - change filters lifecycle Change-Id: I9416fca47a334d532a347cd5577795738c870933
* / CleanupJohn Reck2013-02-055-32/+42
|/ | | | | | | Move Canvas to com.android.photos.canvas Remove workaround for b/8079561 Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
* Merge "Handle syncing better" into gb-ub-photos-bryceJohn Reck2013-02-052-12/+30
|\
| * Handle syncing betterJohn Reck2013-02-042-12/+30
| | | | | | | | | | | | | | | | Bug: 8104531 Limit to every 15 minutes Avoid requesting a sync on a MediaSet that's already syncing Change-Id: Iac4522cd305c64696317cc7088b0e851a2b81893
* | Switch Gallery over to RS compatibility library.Tim Murray2013-02-042-9/+5
|/ | | | Change-Id: If27809236534f3b196949bf455faed45c99f3da5
* fix performance problem with large images in drawJohn Hoford2013-02-012-14/+13
| | | | Change-Id: I9fa5a90e58273c6dd6e80d7d0bf07c3371a6f10e
* Merge "fix sharpen to work under the new system" into gb-ub-photos-bryceJohn Hoford2013-02-013-19/+27
|\
| * fix sharpen to work under the new systemJohn Hoford2013-02-013-19/+27
| | | | | | | | Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19
* | Fix async loading of bordersnicolasroard2013-02-011-39/+54
|/ | | | | bug:8099597 Change-Id: I62584c87eff03539ec50aafafda4238850b4f743
* Merge "Make video snapshot save images in the background." into ↵Angus Kong2013-02-016-48/+97
|\ | | | | | | gb-ub-photos-bryce
| * Make video snapshot save images in the background.Angus Kong2013-01-316-48/+97
| | | | | | | | | | bug:8114662 Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
* | Fix curves refresh bugJohn Hoford2013-02-012-1/+21
|/ | | | Change-Id: I5c85dcfa118345d24a5fef120541741e7d1cbdd6
* Merge "Animate between photo modules" into gb-ub-photos-bryceJohn Reck2013-02-012-20/+95
|\
| * Animate between photo modulesJohn Reck2013-01-312-20/+95
| | | | | | | | Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
* | Merge "Make background media saving a service" into gb-ub-photos-bryceAngus Kong2013-01-313-182/+219
|\ \ | |/ |/|
| * Make background media saving a serviceAngus Kong2013-01-313-182/+219
| | | | | | | | | | bug:8091328 Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48
* | add color selection ui to drawJohn Hoford2013-01-3011-48/+1268
|/ | | | Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
* Merge "show enable sync option for canvas" into gb-ub-photos-bryceJohn Reck2013-01-313-3/+92
|\
| * show enable sync option for canvasJohn Reck2013-01-303-3/+92
| | | | | | | | | | | | Temporary change for testing Change-Id: I46305cb3b182e0a48625bf4fcad3205334ade961
* | Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" ↵nicolasroard2013-01-306-66/+93
|\ \ | |/ |/| | | into gb-ub-photos-bryce
| * Clean up invalidate / redraw loopnicolasroard2013-01-306-66/+93
| | | | | | | | | | | | Move the recopy to the main thread Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce
* | Extract constants/boilerplateJohn Reck2013-01-292-449/+506
|/ | | | Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97
* Merge "Fix thumbnail generation" into gb-ub-photos-brycenicolasroard2013-01-292-1/+2
|\
| * Fix thumbnail generationnicolasroard2013-01-292-1/+2
| | | | | | | | Change-Id: I03a290bf8eb80bd1687bfd37640dec29ef213cdb
* | Merge "Importer: when view is reused for same image, don't reload" into ↵Bobby Georgescu2013-01-292-3/+24
|\ \ | |/ |/| | | gb-ub-photos-bryce
| * Importer: when view is reused for same image, don't reloadBobby Georgescu2013-01-292-3/+24
| | | | | | | | | | Bug: 7968780 Change-Id: I6786d140e516ff60562c5c0b1222fca0ea153216
* | Merge "Fix scaling + quality parameters" into gb-ub-photos-brycenicolasroard2013-01-292-1/+20
|\ \ | |/ |/|
| * Fix scaling + quality parametersnicolasroard2013-01-292-1/+20
| | | | | | | | Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d
* | Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryceMichael Kolb2013-01-2987-0/+22114
|\ \
| * | Move Camera Java/Native source into Gallery2Michael Kolb2013-01-2987-0/+22114
| | | | | | | | | | | | Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
* | | Add comment about MenuExecutor assumptions in BatchServiceBobby Georgescu2013-01-291-0/+3
|/ / | | | | | | | | Bug: 7998915 Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d
* | Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryceJohn Reck2013-01-292-0/+21
|\ \
| * | Launching gallery shows browse ui on canvasJohn Reck2013-01-282-0/+21
| | | | | | | | | | | | Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622
* | | Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryceRuben Brunk2013-01-291-0/+3
|\ \ \ | |_|/ |/| |
| * | Fixed BasicEditor NPE.Ruben Brunk2013-01-281-0/+3
| |/ | | | | | | | | Bug: 8068020 Change-Id: I81df163d9779ae3e246f4e337b64dfbc32ce7db5
* | Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryceBobby Georgescu2013-01-293-8/+14
|\ \
| * | Fix ANRs due to waiting for IO on UI threadBobby Georgescu2013-01-283-8/+14
| |/ | | | | | | | | Bug: 7998915 Change-Id: I938145a7072170f713099a04578f98951b35cbab