summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryceztenghui2013-04-102-31/+179
|\
| * Use MediaMuxer for the video trim and mute.ztenghui2013-04-102-31/+179
* | Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryceAngus Kong2013-04-102-174/+215
|\ \
| * | Refactor CameraDataAdapter for other data types.Angus Kong2013-04-092-174/+215
* | | Small cleanup in setting resourcesnicolasroard2013-04-103-16/+14
* | | Add a third pipeline reserved for the high res previewnicolasroard2013-04-092-2/+18
|/ /
* | Merge "support icon styles" into gb-ub-photos-bryceJohn Hoford2013-04-105-27/+27
|\ \
| * | support icon stylesJohn Hoford2013-04-095-27/+27
* | | Detach old editornicolasroard2013-04-092-2/+7
* | | Merge "Implements swipe in editor menu" into gb-ub-photos-brycenicolasroard2013-04-092-1/+131
|\ \ \
| * | | Implements swipe in editor menunicolasroard2013-04-092-1/+131
| |/ /
* | | Fix to imports in NewPhotoModule.Ruben Brunk2013-04-091-1/+1
* | | Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-b...Ruben Brunk2013-04-0916-16/+1292
|\ \ \
| * | | Moving crop to a separate activity. Refactoring.Ruben Brunk2013-04-0916-16/+1292
* | | | Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-...Angus Kong2013-04-093-118/+557
|\ \ \ \
| * | | | Add more gestures and animations in FilmStripView.Angus Kong2013-04-083-118/+557
| |/ / /
* | | | 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
* | | | 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
* | | | Merge "ui cleanup" into gb-ub-photos-bryceJohn Hoford2013-04-091-13/+11
|\ \ \ \ | |/ / / |/| | |
| * | | ui cleanupJohn Hoford2013-04-091-13/+11
* | | | Work in progress - Put preview in TextureViewDoris Liu2013-04-0916-7/+7295
|/ / /
* | | Fix history original imagenicolasroard2013-04-092-0/+10
* | | Fix history panel first appearancenicolasroard2013-04-091-0/+6
* | | Fix crash in curvesnicolasroard2013-04-081-2/+9
* | | make basic editor based on ParametricEditorJohn Hoford2013-04-086-47/+239
* | | Deactivate Vintage & BW Color FXnicolasroard2013-04-081-4/+4
* | | Add menu item to start the simple editornicolasroard2013-04-082-0/+28
* | | Allow use of texture.Tim Murray2013-04-081-2/+5
* | | Limit creation of greyscale converter RS script.Tim Murray2013-04-081-4/+11
|/ /
* | support for simplified computed iconsJohn Hoford2013-04-082-1/+75
* | 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
* | Merge "Remove redudant setName" into gb-ub-photos-bryceztenghui2013-04-041-1/+0
|\ \
| * | Remove redudant setNameztenghui2013-04-041-1/+0
* | | 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
* | | Merge "Adjust camera menu further" into gb-ub-photos-bryceMichael Kolb2013-04-035-160/+143
|\ \ \
| * | | Adjust camera menu furtherMichael Kolb2013-04-035-160/+143
* | | | Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-...Angus Kong2013-04-031-12/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't access mParameters dirty bit in other threadAngus Kong2013-04-031-12/+8
| |/ /
* | | Improve black bar to keep camera controls in placeDoris Liu2013-04-035-36/+157
* | | fix touch action in drawJohn Hoford2013-04-031-2/+2
|/ /
* | Fix segfaults in RS filtersnicolasroard2013-04-021-2/+11
* | 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
* | | Merge "Make stopPreview synchronous." into gb-ub-photos-bryceAngus Kong2013-04-021-0/+3
|\ \ \ | |/ / |/| |
| * | Make stopPreview synchronous.Angus Kong2013-04-021-0/+3
| |/
* | Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryceBobby Georgescu2013-04-022-0/+10
|\ \ | |/ |/|