summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add a third pipeline reserved for the high res previewnicolasroard2013-04-092-2/+18
| | | | Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
* Merge "support icon styles" into gb-ub-photos-bryceJohn Hoford2013-04-105-27/+27
|\
| * support icon stylesJohn Hoford2013-04-095-27/+27
| | | | | | | | Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
* | Detach old editornicolasroard2013-04-092-2/+7
| | | | | | | | Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
* | Merge "Implements swipe in editor menu" into gb-ub-photos-brycenicolasroard2013-04-092-1/+131
|\ \
| * | Implements swipe in editor menunicolasroard2013-04-092-1/+131
| |/ | | | | | | Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
* | Fix to imports in NewPhotoModule.Ruben Brunk2013-04-091-1/+1
| | | | | | | | Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef
* | Merge "Moving crop to a separate activity. Refactoring." into ↵Ruben Brunk2013-04-0916-16/+1292
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Moving crop to a separate activity. Refactoring.Ruben Brunk2013-04-0916-16/+1292
| | | | | | | | | | | | | | | | | | Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
* | | Merge "Add more gestures and animations in FilmStripView." into ↵Angus Kong2013-04-093-118/+557
|\ \ \ | | | | | | | | | | | | gb-ub-photos-bryce
| * | | Add more gestures and animations in FilmStripView.Angus Kong2013-04-083-118/+557
| |/ / | | | | | | | | | | | | | | | Now supports fullscreen mode and filmstrip mode. Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f
* | | Merge "Refresh parameters during recording." into gb-ub-photos-bryceAngus Kong2013-04-093-0/+15
|\ \ \ | |_|/ |/| |
| * | Refresh parameters during recording.Angus Kong2013-04-093-0/+15
| | | | | | | | | | | | | | | bug:8504803 Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
* | | Merge "Hide the category panel when editing" into gb-ub-photos-brycenicolasroard2013-04-092-0/+18
|\ \ \ | |/ / |/| |
| * | Hide the category panel when editingnicolasroard2013-04-092-0/+18
| | | | | | | | | | | | Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96
* | | Merge "ui cleanup" into gb-ub-photos-bryceJohn Hoford2013-04-091-13/+11
|\ \ \ | |/ / |/| |
| * | ui cleanupJohn Hoford2013-04-091-13/+11
| | | | | | | | | | | | Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
* | | Work in progress - Put preview in TextureViewDoris Liu2013-04-0916-7/+7295
|/ / | | | | | | | | | | | | | | | | | | | | Fixed gesture recognizing and pie menu. Fixed camera picker. Exposure setting got fixed with rebasing. Rebased for new pie menu Fixed camera mode switch listener Ongoing: secure album, aspect ratio for video recording on ICS Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
* | Fix history original imagenicolasroard2013-04-092-0/+10
| | | | | | | | | | | | Change 1st and 2nd panel background color Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
* | Fix history panel first appearancenicolasroard2013-04-091-0/+6
| | | | | | | | Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22
* | Fix crash in curvesnicolasroard2013-04-081-2/+9
| | | | | | | | Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
* | make basic editor based on ParametricEditorJohn Hoford2013-04-086-47/+239
| | | | | | | | Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61
* | Deactivate Vintage & BW Color FXnicolasroard2013-04-081-4/+4
| | | | | | | | | | bug:8503451 Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587
* | Add menu item to start the simple editornicolasroard2013-04-082-0/+28
| | | | | | | | Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
* | Allow use of texture.Tim Murray2013-04-081-2/+5
| | | | | | | | Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf
* | Limit creation of greyscale converter RS script.Tim Murray2013-04-081-4/+11
|/ | | | Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067
* support for simplified computed iconsJohn Hoford2013-04-082-1/+75
| | | | Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd
* Merge "Don't add unsupported options to menu" into gb-ub-photos-bryceMichael Kolb2013-04-051-4/+8
|\
| * Don't add unsupported options to menuMichael Kolb2013-04-051-4/+8
| | | | | | | | | | | | | | | | | | Bug: 8549712 Exposure compensation and whitebalance were not checked when added to the menu. Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df
* | Merge "Remove redudant setName" into gb-ub-photos-bryceztenghui2013-04-041-1/+0
|\ \
| * | Remove redudant setNameztenghui2013-04-041-1/+0
| | | | | | | | | | | | Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c
* | | Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryceJohn Hoford2013-04-041-0/+7
|\ \ \ | |_|/ |/| |
| * | fixed the value that quality was getting set toJohn Hoford2013-04-031-0/+7
| | | | | | | | | | | | Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4
* | | Merge "Adjust camera menu further" into gb-ub-photos-bryceMichael Kolb2013-04-035-160/+143
|\ \ \
| * | | Adjust camera menu furtherMichael Kolb2013-04-035-160/+143
| | | | | | | | | | | | | | | | Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
* | | | Merge "Don't access mParameters dirty bit in other thread" into ↵Angus Kong2013-04-031-12/+8
|\ \ \ \ | |_|/ / |/| | | | | | | gb-ub-photos-bryce
| * | | Don't access mParameters dirty bit in other threadAngus Kong2013-04-031-12/+8
| |/ / | | | | | | | | | Change-Id: I067dd56975cc908f29ed7ba419572982c55b2063
* | | Improve black bar to keep camera controls in placeDoris Liu2013-04-035-36/+157
| | | | | | | | | | | | | | | | | | Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
* | | fix touch action in drawJohn Hoford2013-04-031-2/+2
|/ / | | | | | | Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d
* | Fix segfaults in RS filtersnicolasroard2013-04-021-2/+11
| | | | | | | | | | | | | | | | We did not recreate the filters in all cases when the input size change. bug:8530112 Change-Id: I4cb47498532618271b90e56c01ec63ad991db787
* | Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryceJohn Hoford2013-04-021-1/+3
|\ \
| * | fix calling Allocation.copyFrom without contextJohn Hoford2013-04-021-1/+3
| | | | | | | | | | | | | | | bug:8526929 Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
* | | Merge "Make stopPreview synchronous." into gb-ub-photos-bryceAngus Kong2013-04-021-0/+3
|\ \ \ | |/ / |/| |
| * | Make stopPreview synchronous.Angus Kong2013-04-021-0/+3
| |/ | | | | | | | | bug:8517092 Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
* | Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryceBobby Georgescu2013-04-022-0/+10
|\ \ | |/ |/|
| * Usage statistics for photo and video captureBobby Georgescu2013-04-022-0/+10
| | | | | | | | | | Bug: 8433834 Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
* | Fix stickiness issues with UInicolasroard2013-04-011-9/+11
| | | | | | | | | | | | | | | | The renderGeometryIcon() function shouldn't be synchronized -- it's independent of the rest of the pipeline and is only used to apply a given geometry. Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3
* | Don't try freeing resources on a different thread..nicolasroard2013-04-011-1/+0
| | | | | | | | | | | | | | | | | | This call to freeResources happens on the main thread. It's also not really useful. The geometry instance shouldn't be shared either. bug:8522497 Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4
* | Changed editor back button behavior.Ruben Brunk2013-04-011-7/+2
| | | | | | | | | | Bug: 8522150 Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b
* | Merge "Change panels organization. Also fixes border updates handling." into ↵Ruben Brunk2013-04-023-12/+40
|\ \ | | | | | | | | | gb-ub-photos-bryce