summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Cleanup in ImagePresetnicolasroard2013-06-261-46/+73
| | | | | | | | | | | | Move GeometryMetadata to the list of filters Change-Id: I0bef13ca0d9cb41e68eddd108000ff7bd426b313
* | Merge "Clean up PreviewGestures" into gb-ub-photos-carlsbadMichael Kolb2013-06-261-61/+3
|\ \ | |/ |/|
| * Clean up PreviewGesturesMichael Kolb2013-06-261-61/+3
| | | | | | | | | | | | | | - remove dead code and state - fix zoom only mode during video recording Change-Id: I2238f99b9823ba091d300046d07448c67bc2ad78
* | Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbadztenghui2013-06-264-5/+5
|\ \ | |/ |/|
| * Fix ambiguous naming and typoztenghui2013-06-264-5/+5
| | | | | | | | | | bug:9468909 Change-Id: Ic52f3b6f6b5d0c874e8291ce7b3a76cb6c22f60f
* | Merge "Cleanup ImagePreset to remove special-casing for borders" into ↵nicolasroard2013-06-261-75/+60
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Cleanup ImagePreset to remove special-casingnicolasroard2013-06-251-75/+60
| | | | | | | | | | | | for borders Change-Id: I6410a7a44d72c3dfa51c1d18f5a6fcba854ba9c2
* | Merge "Clean up camera switcher" into gb-ub-photos-carlsbadDoris Liu2013-06-253-0/+0
|\ \
| * | Clean up camera switcherDoris Liu2013-06-243-0/+0
| |/ | | | | | | Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
* | Merge "Fix the missing filter name after deserialization." into ↵ztenghui2013-06-251-1/+2
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Fix the missing filter name after deserialization.ztenghui2013-06-241-1/+2
| | | | | | | | | | | | bug:9468909 Change-Id: I63aaf0bad02c2afdddf9b162f695fc0a9165befa
* | Merge "Remove SRI panorama" into gb-ub-photos-carlsbadDoris Liu2013-06-2112-968/+0
|\ \ | |/ |/|
| * Remove SRI panoramaDoris Liu2013-06-2012-968/+0
| | | | | | | | Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
* | Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbadztenghui2013-06-191-0/+1
|\ \
| * | Fix LUT3D information lost after re-editztenghui2013-06-191-0/+1
| | | | | | | | | | | | | | | | | | bug:9427243 Change-Id: I8535c8776c866fd6c84d391a8de82df9cb214694
* | | Add flash animation to photo moduleDoris Liu2013-06-191-0/+7
| |/ |/| | | | | Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
* | Switch over to use new camera activityDoris Liu2013-06-188-642/+121
| | | | | | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* | Add more metrics to EditorBobby Georgescu2013-06-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 9467671 Instrument - Editor opened - Number of filters used in save - Undo/redo/reset/state panel - Save completed Change-Id: I4722f36496ccd089829bd616f89d760078922573
* | Added serialization IDs for frames, adds frames to analytics.Ruben Brunk2013-06-171-1/+1
| | | | | | | | | | Bug: 9467671 Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
* | Fix IDs for analytics, unlocalize serialization IDs.Ruben Brunk2013-06-172-3/+1
| | | | | | | | | | | | Bug: 9467671 Bug: 9336168 Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed
* | Fix icon sizes and jaggiesnicolasroard2013-06-114-2/+19
|/ | | | | | bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
* Merge "Disable zoom when camera does not support zoom" into ↵Doris Liu2013-06-111-1/+10
|\ | | | | | | gb-ub-photos-carlsbad
| * Disable zoom when camera does not support zoomDoris Liu2013-06-111-1/+10
| | | | | | | | Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
* | Fix text size in the state panelnicolasroard2013-06-101-0/+4
| | | | | | | | Change-Id: I0290b2039d987605e3cc82e3c4d486b7855059b2
* | Fix warningsnicolasroard2013-06-101-3/+3
|/ | | | Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
* Add a layout for undo barDoris Liu2013-06-053-2/+65
| | | | Change-Id: Id795f00c8ca5f147f6aae8c1f9cba4e1da1e5b20
* Merge "Removing unused UI fields in FilterRepresentation." into ↵Ruben Brunk2013-06-0510-70/+22
|\ | | | | | | gb-ub-photos-carlsbad
| * Removing unused UI fields in FilterRepresentation.Ruben Brunk2013-06-0510-70/+22
| | | | | | | | | | | | Bug: 9170644 Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
* | Remove the frameLayout wrapping CameraRootViewDoris Liu2013-06-041-10/+4
| | | | | | | | Change-Id: I5a238766b54d3f36c929c53225367cddf90473f9
* | Merge "Add secure camera support." into gb-ub-photos-carlsbadAngus Kong2013-06-041-0/+23
|\ \ | |/ |/|
| * Add secure camera support.Angus Kong2013-06-031-0/+23
| | | | | | | | Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
* | am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-06-030-0/+0
|\ \ | |/ |/| | | | | | | | | gb-ub-photos-bryce * commit 'e40d9a1e39596220d1949b869ed4c167ca8e63a5': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEBaligh Uddin2013-06-0349-0/+116
| | | | | | | | | | Change-Id: I8b878349f27250babd1dc79b0a152ae19293242e Auto-generated-cl: translation import
* | Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbadztenghui2013-06-031-3/+5
|\ \
| * | Add LUT3D filter state savingztenghui2013-05-311-3/+5
| | | | | | | | | | | | Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018
* | | am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-06-010-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | gb-ub-photos-bryce * commit '6d1345aa496d9f5caedae6b3b0c5b6132fb01893': Import translations. DO NOT MERGE