summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
* 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 warningsnicolasroard2013-06-101-3/+3
|/ | | | Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
* Removing unused UI fields in FilterRepresentation.Ruben Brunk2013-06-0510-70/+22
| | | | | | Bug: 9170644 Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
* 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
* | Improve gesture handlingDoris Liu2013-05-311-175/+71
| | | | | | | | Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
* | Mirroring google3 for CL 47368174.Ruben Brunk2013-05-301-0/+5
|/ | | | Change-Id: Ic29d8d6784870660e0bd83f870ec2cf0c244746d
* functionality added to transport filter parameter values to following ↵Christian Wichner2013-05-241-0/+24
| | | | | | filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame. Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3
* Add new camera activity back and fix build errorsDoris Liu2013-05-161-0/+358
| | | | Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
* resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbadztenghui2013-05-091-3/+8
|\ | | | | | | Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39
| * Fix the verbose logztenghui2013-05-081-3/+8
| | | | | | | | | | | | | | | | Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging. bug:8771541 Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
* | Remove new camera activity to avoid build breakageDoris Liu2013-05-081-358/+0
| | | | | | | | Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe
* | am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." ↵Sascha Haeberling2013-05-071-1/+1
|\| | | | | | | | | | | | | into gb-ub-photos-bryce * commit '6febbfc6c9c2d645f22fb200574fe14fa1201046': Avoid rounding errors from cropping uncropped images.
| * Avoid rounding errors from cropping uncropped images.Sascha Haeberling2013-05-071-1/+1
| | | | | | | | | | | | | | | | Bug: 8736111 Also don't treat "none" as a non-modifying filter. Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
* | am 00259461: Fix UInicolasroard2013-05-012-6/+10
|\| | | | | | | | | * commit '00259461be82e601b58d3e970afbf0c012c5f3e7': Fix UI
| * Fix UInicolasroard2013-05-012-6/+10
| | | | | | | | | | bug:8664728 Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
* | resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbadJohn Hoford2013-05-012-2/+3
|\| | | | | | | Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-292-2/+3
| | | | | | | | | | bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
* | Modifications for simple editnicolasroard2013-04-294-17/+47
| | | | | | | | Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f
* | am 45377ce9: Merge "Log name of borders and filters of saved images" into ↵Bobby Georgescu2013-04-261-0/+9
|\| | | | | | | | | | | | | gb-ub-photos-bryce * commit '45377ce902eb0dce6fb6b1e58925654822e25a19': Log name of borders and filters of saved images
| * Log name of borders and filters of saved imagesBobby Georgescu2013-04-261-0/+9
| | | | | | | | | | Bug: 8712946 Change-Id: Id7b32ceb00b131299c6d8630bca181141dc204fd
| * Remove new camera activity code from BryceDoris Liu2013-04-251-358/+0
| | | | | | | | | | Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
* | resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbadnicolasroard2013-04-252-2/+20
|\| | | | | | | Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
| * Merge "UI changes" into gb-ub-photos-brycenicolasroard2013-04-251-0/+19
| |\
| | * UI changesnicolasroard2013-04-241-0/+19
| | | | | | | | | | | | | | | | | | bug:8664728 Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
* | | am 2e85f988: Merge "Fix for popuping being hard to dismiss" into ↵Doris Liu2013-04-241-0/+5
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '2e85f98891ffdccb1b7da1945f80af2de5c9a414': Fix for popuping being hard to dismiss
| * | Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryceDoris Liu2013-04-241-0/+5
| |\ \ | | |/ | |/|
| | * Fix for popuping being hard to dismissDoris Liu2013-04-231-0/+5
| | | | | | | | | | | | | | | Bug: 8688503 Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3
* | | am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryceJohn Hoford2013-04-241-3/+30
|\| | | | | | | | | | | | | | * commit 'cc7bcd0721735723c683b2f27267a52a76ff4244': Fix Curves
| * | Fix CurvesJohn Hoford2013-04-241-3/+30
| | | | | | | | | | | | | | | bug:8710572 Change-Id: I49a8ea124be59de6d246ae0f9fb16f04fe447af7
* | | am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryceJohn Hoford2013-04-232-0/+13
|\| | | | | | | | | | | | | | * commit '0c71308c9d2a72d4a3faf00242707de773d5beba': interruptible renderer
| * | interruptible rendererJohn Hoford2013-04-232-0/+13
| |/ | | | | | | | | bug:8632908 Change-Id: I4df59fb0c82370491d953292fd1cd17443054ab3
* | am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryceDoris Liu2013-04-221-0/+8
|\| | | | | | | | | * commit 'd6e6533a054ea526021c3331a18f93a618442f13': Fix for camera switcher hard to hit
| * Fix for camera switcher hard to hitDoris Liu2013-04-201-0/+8
| | | | | | | | | | Bug: 8667079 Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707
* | am 91d26f6c: tiny planet fixJohn Hoford2013-04-222-0/+43
|\| | | | | | | | | * commit '91d26f6c3b183862eeffc1856e2d758e800d13f4': tiny planet fix
| * tiny planet fixJohn Hoford2013-04-192-0/+43
| | | | | | | | | | bug:8323524 Change-Id: I39283face7079574dbe25e797323a84141930f9a
* | am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into ↵Doris Liu2013-04-221-3/+34
|\| | | | | | | | | | | | | gb-ub-photos-bryce * commit '14fe288784c574c84edbf84306329dc8b70d8b4d': Allow swiping to filmstrip from blocker bar
| * Allow swiping to filmstrip from blocker barDoris Liu2013-04-181-3/+34
| | | | | | | | | | Bug: 8607910 Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
* | Merge "Support for save state in images" into gb-ub-photos-carlsbadJohn Hoford2013-04-1810-5/+375
|\ \
| * | Support for save state in imagesJohn Hoford2013-04-1710-5/+375
| |/ | | | | | | | | | | bug:8626775 Change-Id: I2a34a6027b23dab9c1802f672bfbf399cac0c4f7
* / Fix border apply if no filter appliednicolasroard2013-04-171-4/+14
|/ | | | Change-Id: Ic5b319625b42adb298094c4ad202d6c161538644
* New state panelnicolasroard2013-04-151-6/+2
| | | | | | | bug:8620913 bug:8503386 Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
* support for simplified parameters in filterJohn Hoford2013-04-151-0/+11
| | | | Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
* Add direct rendering for bordernicolasroard2013-04-121-0/+15
| | | | | | bug:8603245 Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
* Add a direct rendering modenicolasroard2013-04-122-0/+35
| | | | | | | | | | | This takes input and output allocations. Also added a utility method in ImageFilterRS to scale textures at screen resolution. bug:8603245 bug:8588853 Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
* support icon stylesJohn Hoford2013-04-092-1/+7
| | | | Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
* Work in progress - Put preview in TextureViewDoris Liu2013-04-091-0/+358
| | | | | | | | | | | 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
* Merge "Change panels organization. Also fixes border updates handling." into ↵Ruben Brunk2013-04-021-11/+28
|\ | | | | | | gb-ub-photos-bryce
| * Change panels organization. Also fixes border updates handling.Ruben Brunk2013-04-011-11/+28
| | | | | | | | Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe