summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge res/ from platform/packages/apps/Gallery2 to res/Qiwen Zhao2013-08-051004-0/+34921
|\
| * Merge "Clean up the test tags used by the continuous test service to ↵Jason Noguchi2013-08-036-10/+0
| |\ | | | | | | | | | determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context." into gb-ub-photos-carlsbad
| | * Clean up the test tags used by the continuous test service to determine whichJason Noguchi2013-08-026-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context. Change-Id: I2d3db31b0800dcbed42c881c5eaa589517fd9f87
| * | Fix display bug with highresnicolasroard2013-08-021-1/+1
| | | | | | | | | | | | Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
| * | Add quality selector to export.Ruben Brunk2013-08-022-0/+84
| | | | | | | | | | | | | | | | | | | | | - Adds the option to change the quality of the jpeg compression when flattening an exported bitmap. Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
| * | Hide "View Photo Sphere" button by default.Sascha Haeberling2013-08-011-0/+1
| |/ | | | | | | Change-Id: Idb31a96d0dcb19e6d57c1c5d388ef8d180382345
| * Merge "add Per Channel Saturation" into gb-ub-photos-carlsbadJohn Hoford2013-08-026-3/+270
| |\
| | * add Per Channel SaturationJohn Hoford2013-08-016-3/+270
| | | | | | | | | | | | Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
| * | Merge "Adds back the PhotoSphere View icon in filmstrip." into ↵Sascha Haeberling2013-08-011-5/+25
| |\ \ | | |/ | |/| | | | gb-ub-photos-carlsbad
| | * Adds back the PhotoSphere View icon in filmstrip.Sascha Haeberling2013-08-011-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also exercises the "leave a place cleaner than you found it" rule by cleaning up stuff: - Formatting according to the Android format rules - Removing unused code - Putting braces where they belong. Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
| * | Refactoring Geometry handling.Ruben Brunk2013-08-015-178/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9170644 Bug: 9366654 Bug: 9366263 - Consolidates all the geometry transforms in GeometryMathUtils and significantly reduces complexity. - Removes GeometryMetadata object and dependent code. - Removes ImageGeometry and geometry update callbacks. Change-Id: I59add51907459593244c9ebaadef585efc7486d5
| * | Fix problem with N-1 caching when no filters / one filternicolasroard2013-07-314-0/+55
| | | | | | | | | | | | | | | | | | - also fix equals() for geometry Change-Id: I6f6f21d1e274b3b95ac4b5189b2fa7f419912864
| * | Merge "Implements N-1 Caching" into gb-ub-photos-carlsbadnicolasroard2013-07-312-0/+21
| |\ \
| | * | Implements N-1 Cachingnicolasroard2013-07-312-0/+21
| | |/ | | | | | | | | | Change-Id: Ief1a04dbe4f6ced15f937177a556733cfcdb5879
| * / Set default video quality to the highestDoris Liu2013-07-311-1/+0
| |/ | | | | | | | | | | Bug: 9886141 Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
| * Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbadJohn Hoford2013-07-305-40/+24
| |\
| | * clean up some bugs and update the iconsJohn Hoford2013-07-305-40/+24
| | | | | | | | | | | | Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
| * | Add user presets saving/loadingnicolasroard2013-07-309-10/+624
| |/ | | | | | | Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
| * Merge "add Grad filter" into gb-ub-photos-carlsbadJohn Hoford2013-07-3018-0/+673
| |\
| | * add Grad filterJohn Hoford2013-07-2918-0/+673
| | | | | | | | | | | | Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
| * | Merge "Refocus integration phase 1." into gb-ub-photos-carlsbadSascha Haeberling2013-07-272-0/+2
| |\ \ | | |/ | |/|
| | * Refocus integration phase 1.Sascha Haeberling2013-07-242-0/+2
| | | | | | | | | | | | | | | | | | Bug: 9966846 Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
| * | Fix geometry serializationnicolasroard2013-07-261-15/+0
| | | | | | | | | | | | Change-Id: I3040cfdb08f6cc6dbd4fd1eb5444b3395a68c7da
| * | Added support to export to a flattened photo.Ruben Brunk2013-07-252-0/+8
| |/ | | | | | | | | | | | | | | | | | | Bug: 10008212 - Adds a menu item to allow a photo with edits to be flattened into a separate photo. - Fixes bug where crop intents fail to save cropped images. Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
| * Move ImageCurves to the ImageShow packagenicolasroard2013-07-221-2/+2
| | | | | | | | Change-Id: I458d20df930b9228dcbc60c3ec27f74b152d38cf
| * Merge "Remove FilteringPipeline" into gb-ub-photos-carlsbadnicolasroard2013-07-191-0/+90
| |\
| | * Remove FilteringPipelinenicolasroard2013-07-191-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize things around the filtering service. - add HighresRenderingTask - add RenderingRequestTask - add UpdatePreviewTask Change-Id: I3da34fee8c624fb55311c3e1639857fc1bcdadad
| * | Refactoring GeometryMetadata.Ruben Brunk2013-07-176-0/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9170644 - First part of multi-step refactor, splits GeometryMetadata functionality into 4 FilterRepresentation subclasses as requested. Change-Id: I212193db8c154f64c550adb9735c0502bcaa7468
| * | remove cloneJohn Hoford2013-07-1713-80/+131
| | | | | | | | | | | | Change-Id: Ia9f4c1778e06416018eeb07be657bcdd0af1496b
| * | Fix help for GalleryGoogle buildsJohn Reck2013-07-171-3/+0
| |/ | | | | | | | | | | Bug: 9886976 Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333 (cherry picked from commit 7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
| * Add background processing servicenicolasroard2013-07-162-2/+7
| | | | | | | | | | | | bug:7298624 Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357
| * Add equality check into FilterCurveRepztenghui2013-07-151-0/+23
| | | | | | | | | | | | | | Consequently add equality check support in Spline and ControlPoint. bug:9468909 Change-Id: I8078b994beac4056ca92e76da0e15d618389e56e
| * FilterDirectRepresentation always should be considered as has modification.ztenghui2013-07-151-4/+0
| | | | | | | | | | | | | | Therefore isNil should be false. bug:9468909 Change-Id: I9946d060e7a1c73b6dc27c73d8f3b7986343de98
| * Added jpeg streaming classes.Ruben Brunk2013-07-111-0/+0
| | | | | | | | | | | | | | | | | | - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
| * Refactoring ImageLoader.Ruben Brunk2013-07-101-12/+1
| | | | | | | | | | | | | | | | - Moves state (history, loadlisteners, bitmaps, etc.) from ImageLoader to MasterImage. - Makes ImageLoader into a utility class. Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c
| * Remove FilterIconButtonnicolasroard2013-07-031-18/+0
| | | | | | | | Change-Id: Ie1d7c4e8d3f397323f702eba2809f2589b8071f0
| * Improves portrait categories buttonsnicolasroard2013-07-023-0/+19
| | | | | | | | | | | | | | | | | | - use only CategoryView, no FilterIconButton - add xml values for the font size/margins - for now reuse the same Action bitmap - add accessibility contentDescription Change-Id: Ic1ae8015abba27bea0b3c4a2bccbd1a7c9ff4731
| * Move classes to pipeline packagenicolasroard2013-07-025-205/+2
| | | | | | | | Change-Id: I9d664537d845d9daeb352c8006d0296a3f546dca
| * Pipeline refactoringnicolasroard2013-07-023-55/+69
| | | | | | | | | | | | | | Remove the temp representations and instead use a triple buffer for ImagePresets. Change-Id: I4cdcfbe4941af72b38fe42385085ff4a20eb78cc
| * Pipeline refactoringnicolasroard2013-07-011-1/+6
| | | | | | | | | | | | Add SharedBuffer and Buffer class Change-Id: I823a9520541e3be5321a3deb5e58a358588b6cf3
| * Merge "Fix the save button issue." into gb-ub-photos-carlsbadztenghui2013-07-012-0/+17
| |\
| | * Fix the save button issue.ztenghui2013-07-012-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | When dealing with non Fx filters, the hasModification() really need to go deep to figure out whether things has changed. bug:9468909 Change-Id: I89495f147f7af7c35490def84805aae98e3f917f
| * | small bug in reading presetsJohn Hoford2013-06-271-16/+2
| |/ | | | | | | Change-Id: I791a8407d72b92f5e46a33c254d44747308b2ba5
| * Save button now behaves correctly for filter changes.ztenghui2013-06-272-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | Basically, save the original filter from the file's XMP. Compare the current filter against original one to decide whether or not the file has been modified and needed to be saved. At the same time, make sure we don't save "None" filter in the ImagePreset. bug:9468909 Change-Id: I5b86ab95556b6b010367c9577b02c0bb42ffb824
| * Fix selected frame in looks and bordersnicolasroard2013-06-271-0/+9
| | | | | | | | Change-Id: Id1839a028f3044929043d7c910df30a1fcabdda1
| * ImagePreset cleanupnicolasroard2013-06-271-68/+0
| | | | | | | | | | | | Get rid of remaining ivars related to history Change-Id: Ic106ef6a96f4727c6dd46d7be3d059bdc42e5a2a
| * Merge "support non destructive edits of Curves" into gb-ub-photos-carlsbadJohn Hoford2013-06-273-19/+132
| |\
| | * support non destructive edits of CurvesJohn Hoford2013-06-263-19/+132
| | | | | | | | | | | | Change-Id: I597be6570a17072a4116bf6227a6a35796266bc3
| * | Fix totnicolasroard2013-06-261-1/+0
| |/ | | | | | | Change-Id: I75b28ac56f9c3b295280690078f5c854fda7eb66
| * Merge "Cleanup in ImagePreset" into gb-ub-photos-carlsbadnicolasroard2013-06-261-46/+73
| |\