summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a third pipeline reserved for the high res previewnicolasroard2013-04-093-2/+27
| | | | 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-093-2/+133
|\ \
| * | Implements swipe in editor menunicolasroard2013-04-093-2/+133
| |/ | | | | | | 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-0918-17/+1355
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Moving crop to a separate activity. Refactoring.Ruben Brunk2013-04-0918-17/+1355
| | | | | | | | | | | | | | | | | | 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-095-29/+32
|\ \ \
| * | | ui cleanupJohn Hoford2013-04-095-29/+32
| | | | | | | | | | | | | | | | Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
* | | | Remove unneeded READ_SMS permissionBobby Georgescu2013-04-091-1/+0
| |/ / |/| | | | | | | | | | | Bug: 8469283 Change-Id: I0d211705fe1fb86dc0ce85230e82d500f0202291
* | | Work in progress - Put preview in TextureViewDoris Liu2013-04-0920-7/+7426
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 panel color background in landscapenicolasroard2013-04-091-0/+2
|/ / | | | | | | Change-Id: Id1a0470c8df5fe39f5504a43e1602672ac0d584d
* | Fix history original imagenicolasroard2013-04-094-0/+12
| | | | | | | | | | | | Change 1st and 2nd panel background color Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
* | Fix history panel first appearancenicolasroard2013-04-091-0/+6
| | | | | | | | Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22
* | Fix positioning of cancel/done buttonsnicolasroard2013-04-081-8/+7
| | | | | | | | Change-Id: Ie229a20d882841444ece28a3ab63cbc6ea916699
* | Fix crash in curvesnicolasroard2013-04-081-2/+9
| | | | | | | | Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
* | make basic editor based on ParametricEditorJohn Hoford2013-04-087-47/+277
| | | | | | | | Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61
* | Deactivate Vintage & BW Color FXnicolasroard2013-04-081-4/+4
| | | | | | | | | | bug:8503451 Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587
* | Merge "Add menu item to start the simple editor" into gb-ub-photos-brycenicolasroard2013-04-094-1/+37
|\ \
| * | Add menu item to start the simple editornicolasroard2013-04-084-1/+37
| | | | | | | | | | | | Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
* | | Bump up the version number to 1.1.40009Bart Sears2013-04-081-2/+2
|/ / | | | | | | Change-Id: Ia266e6493a535cd4ae36fda2fa497195b810ebb4
* | Merge "Allow use of texture." into gb-ub-photos-bryceTim Murray2013-04-081-2/+5
|\ \
| * | Allow use of texture.Tim Murray2013-04-081-2/+5
| | | | | | | | | | | | Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf
* | | Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryceTim Murray2013-04-081-4/+11
|\| |
| * | Limit creation of greyscale converter RS script.Tim Murray2013-04-081-4/+11
| |/ | | | | | | Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067
* / Increase the CHAR LIMIT for color_pick_selectJohn Hoford2013-04-081-1/+1
|/ | | | | bug: 8131770 Change-Id: I665316d3ff6ec10fcace8ee1bb9237f4057a4797
* support for simplified computed iconsJohn Hoford2013-04-082-1/+75
| | | | Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd
* Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryceBart Sears2013-04-051-2/+2
|\
| * Bump up the version number to 1.1.40008Bart Sears2013-04-051-2/+2
| | | | | | | | Change-Id: I42dce1bc936b54a4d4f72c2179d2f1d9e27f72d7
* | Added check to strip out uninitialized EXIF tags.Ruben Brunk2013-04-051-0/+16
|/ | | | | Bug: 8552339 Change-Id: Ib6ae4f59f9e393e5f6b46877a4b2c3b2fe1852d3
* Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-058-64/+32
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-04-058-64/+32
| | | | | | | | | | Change-Id: I2e919072c23a9b7d081416f1f55dd5991381a56b Auto-generated-cl: translation import
* | 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
* | | Bump up the version number to 1.1.40007Bart Sears2013-04-041-2/+2
| | | | | | | | | | | | Change-Id: Ia494e2c210f642ec0232394d0cfabaf5e1b8f96a
* | | 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-036-164/+147
|\ \ \
| * | | Adjust camera menu furtherMichael Kolb2013-04-036-164/+147
| | | | | | | | | | | | | | | | Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
* | | | Merge "Don't access mParameters dirty bit in other thread" into ↵Angus Kong2013-04-031-12/+8
|\ \ \ \ | |_|/ / |/| | | | | | | gb-ub-photos-bryce