summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* / Fix apply geometry.nicolasroard2013-01-282-1/+1
|/ | | | | bug:8068166 Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8
* Code dropJohn Reck2013-01-284-0/+1874
| | | | Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
* Revert "Switch Gallery over to RS compatibility library."Stephen Hines2013-01-232-5/+9
| | | | | | This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
* Switch Gallery over to RS compatibility library.Stephen Hines2013-01-222-9/+5
| | | | Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
* Better caching for RS filtersnicolasroard2013-01-2214-399/+562
| | | | Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d
* Merge "Tweaks for canvas" into gb-ub-photos-bryceJohn Reck2013-01-194-9/+33
|\
| * Tweaks for canvasJohn Reck2013-01-184-9/+33
| | | | | | | | Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
* | Merge "refactor the filter/editor relationship" into gb-ub-photos-bryceJohn Hoford2013-01-1812-21/+423
|\ \
| * | refactor the filter/editor relationshipJohn Hoford2013-01-1812-21/+423
| | | | | | | | | | | | Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
* | | Fix importer crashes on unplug during scrollingBobby Georgescu2013-01-181-1/+10
|/ / | | | | | | | | Bug: 8035040 Change-Id: If822b15f2210e2af42c8a38f6ac2acb25d535aa9
* | Fix importer crashes when unplugging during indexingBobby Georgescu2013-01-171-119/+156
| | | | | | | | | | | | | | | | | | | | Bug: 8027984 Slightly refactored the indexing step to encapsulate all of the indexing work within the runnable that does it and to correctly handle the cases where the device is unplugged in the middle of the indexing. Change-Id: I338657bbbedd6b82d012f65cd1ea28e0afd890c2
* | Show status in importer for empty or no deviceBobby Georgescu2013-01-173-5/+55
|/ | | | | Bug: 8000251 Change-Id: Iefbbe6df59f432ffeb10ac9fa846a8908584ab58
* Merge "New loading model" into gb-ub-photos-bryceJohn Reck2013-01-1720-203/+281
|\
| * New loading modelJohn Reck2013-01-1620-203/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | Rename reload() to loadIfDirty() loadIfDirty is implemented by MediaSet and is final loadIfDirty is now blocking instead of async Subclasses must implement two protected methods, isDirtyLocked() and load() The change from async reload() to sync loadIfDirty() should be fine since all users of reload() were doing so from a background thread already, and the longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
* | Merge "Always have determinate progress in import notification" into ↵Bobby Georgescu2013-01-161-5/+4
|\ \ | |/ |/| | | gb-ub-photos-bryce
| * Always have determinate progress in import notificationBobby Georgescu2013-01-161-5/+4
| | | | | | | | | | Bug: 7967520 Change-Id: Iaeb5f2e3d508d964856faaea63475cbc25e13c0d
* | Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryceJohn Reck2013-01-162-0/+15
|\ \
| * | Add a blocking load to MediaSetJohn Reck2013-01-162-0/+15
| | | | | | | | | | | | Change-Id: I367975fd33f884fb7e576b7064c495bdb7a3ce7b