summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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
* 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
* | 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
* | resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbadnicolasroard2013-04-252-2/+20
|\| | | | | | | Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
| * UI changesnicolasroard2013-04-241-0/+19
| | | | | | | | | | | | bug:8664728 Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
* | 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 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
* | 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
* Change panels organization. Also fixes border updates handling.Ruben Brunk2013-04-011-11/+28
| | | | Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
* Fixes some state synchronization issuesnicolasroard2013-03-301-1/+2
| | | | Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
* Merge "add flexable ui for parameters" into gb-ub-photos-bryceJohn Hoford2013-03-291-1/+30
|\
| * add flexable ui for parametersJohn Hoford2013-03-291-1/+30
| | | | | | | | Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921
* | Re-enable caching step in RS filtersnicolasroard2013-03-281-0/+1
|/ | | | | | | | | | | | | | Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 With the compatibility library, different Scripts instances actually points to the same thing. We thus need to explicitely rebind all the variables to the correct script instance before running RS filters... Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b
* Moves ownership of the environment to the pipelinenicolasroard2013-03-261-45/+11
| | | | Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
* Fix crashes with RS filtersnicolasroard2013-03-201-2/+14
| | | | | | bug:8418537 Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365
* Fix preview synchronizationnicolasroard2013-03-121-0/+1
| | | | Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04
* Various bugfixes/improvements for Fx Filters:nicolasroard2013-03-113-15/+19
| | | | | | | | | - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps Change-Id: I5631a5bcec12c121871b3575066c201486896a14
* Clear border resources to save memorynicolasroard2013-03-091-6/+0
| | | | Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2
* Memory usage improvements, speed improvementnicolasroard2013-03-083-13/+100
| | | | | | | | - free filters resources agressively - implements multiple rendering pipelines - some cleanup Change-Id: Ib9ed268b0b2662d0bf5c049adcf046b556954c37
* Visual Historynicolasroard2013-03-051-0/+9
| | | | Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
* UI cleanupnicolasroard2013-03-042-0/+3
| | | | Change-Id: Iaf138455651511e610b640a716820bd846284948
* Improves State panel and Refactor FilterShowActivitynicolasroard2013-03-011-0/+21
| | | | | | | | - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2
* fix importsJohn Hoford2013-03-012-2/+0
| | | | Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7
* Revert "Cleanup ImagePreset"Nicolas Roard2013-02-281-53/+69
| | | | | | This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01 Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
* Cleanup ImagePresetnicolasroard2013-02-271-69/+53
| | | | Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e