summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/filters
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbadztenghui2013-06-032-6/+9
|\
| * Add LUT3D filter state savingztenghui2013-05-312-6/+9
| | | | | | | | 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/+9
| | | | | | filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame. Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3
* Revert "Reinitialize all the filters after Crop is applied."Ruben Brunk2013-05-104-25/+2
| | | | This reverts commit 1cfbaca7bef29b7d510c5e1de424e68cd8804022.
* Reinitialize all the filters after Crop is applied.Victor Doba2013-05-104-2/+25
| | | | Change-Id: I192918a3f28eac400e2e35f3b410dc8adc1a8ad4
* 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 00259461: Fix UInicolasroard2013-05-011-1/+1
|\| | | | | | | | | * commit '00259461be82e601b58d3e970afbf0c012c5f3e7': Fix UI
| * Fix UInicolasroard2013-05-011-1/+1
| | | | | | | | | | bug:8664728 Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
* | Merge "G+ activity xform stack and pipeline cleanup." into gb-ub-photos-carlsbadRuben Brunk2013-05-011-0/+2
|\ \
| * | G+ activity xform stack and pipeline cleanup.Ruben Brunk2013-04-301-0/+2
| | | | | | | | | | | | Change-Id: I3277dd4e709146ca2c06b56a1db200d3130dd5e3
* | | fix crash due to no ImageFilterDrawJohn Hoford2013-05-011-1/+1
| | | | | | | | | | | | Change-Id: I0c8bfaa7d162f5c1a49f05d853f4700322fe5901
* | | resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbadJohn Hoford2013-05-013-3/+4
|\ \ \ | |/ / |/| / | |/ Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-293-4/+5
| | | | | | | | | | bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
* | Modifications for simple editnicolasroard2013-04-299-41/+59
| | | | | | | | Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f
* | resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbadnicolasroard2013-04-252-1/+19
|\| | | | | | | Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
| * UI changesnicolasroard2013-04-241-0/+18
| | | | | | | | | | | | 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 91d26f6c: tiny planet fixJohn Hoford2013-04-222-34/+21
|\| | | | | | | | | * commit '91d26f6c3b183862eeffc1856e2d758e800d13f4': tiny planet fix
| * tiny planet fixJohn Hoford2013-04-192-34/+21
| | | | | | | | | | bug:8323524 Change-Id: I39283face7079574dbe25e797323a84141930f9a
* | resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbadrepo sync2013-04-221-4/+35
|\| | | | | | | Change-Id: Ic6759448c932823720021e85e1232736ff2085f8
| * fixed borders issuesJohn Hoford2013-04-181-4/+35
| | | | | | | | | | bug:8315216 Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471
| * Remove redeye filter.Ruben Brunk2013-04-171-2/+2
| | | | | | | | | | Bug: 8609003 Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
| * Make convertBitmap() protected so that Frames can use it.nicolasroard2013-04-161-1/+1
| | | | | | | | | | bug:8633011 Change-Id: Ic731a1d906a6a388a22568f396111f8ca3b4475e
* | Add extra perf loggingnicolasroard2013-04-181-0/+10
| | | | | | | | Change-Id: Iebbb4491e69d356c0c73cd314c295857a2d6e357
* | Support for save state in imagesJohn Hoford2013-04-1724-15/+185
| | | | | | | | | | | | bug:8626775 Change-Id: I2a34a6027b23dab9c1802f672bfbf399cac0c4f7
* | convertBitmap is needed by ImageFilterFixedFrame.Christian Wichner2013-04-161-1/+1
|/ | | | Change-Id: I2094c54745f94dab2283e2a466371d15d5a57b0a
* support for simplified parameters in filterJohn Hoford2013-04-151-0/+11
| | | | Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
* Add a direct rendering modenicolasroard2013-04-122-0/+60
| | | | | | | | | | | 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
* Small cleanup in setting resourcesnicolasroard2013-04-101-0/+7
| | | | Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
* Merge "support icon styles" into gb-ub-photos-bryceJohn Hoford2013-04-101-1/+5
|\
| * support icon stylesJohn Hoford2013-04-091-1/+5
| | | | | | | | Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
* | Merge "Moving crop to a separate activity. Refactoring." into ↵Ruben Brunk2013-04-091-1/+1
|\ \ | |/ |/| | | gb-ub-photos-bryce
| * Moving crop to a separate activity. Refactoring.Ruben Brunk2013-04-091-1/+1
| | | | | | | | | | | | Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
* | 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
* 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
* Change panels organization. Also fixes border updates handling.Ruben Brunk2013-04-011-0/+4
| | | | 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-282-12/+22
|/ | | | | | | | | | | | | | 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
* Fix deadlock.nicolasroard2013-03-271-62/+30
| | | | | | | Move the RenderScript context and Resources to CachingPipeline. bug:8491107 Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d
* Fixed renderscript crashes.Ruben Brunk2013-03-271-7/+4
| | | | | | | | | | | | | Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 createFilter() initializes a ton of parameters in the RenderScript filters. Using stale parameters from a previous call to createFilter() causes segfaults. Change-Id: Id54b956b7fe83be5089b1d47c3bedcca66237ddf
* Moves ownership of the environment to the pipelinenicolasroard2013-03-261-1/+1
| | | | Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
* Refactoring: removed unnecessary apply calls.Ruben Brunk2013-03-226-48/+7
| | | | Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6
* Fix problem applying the Fx filternicolasroard2013-03-212-2/+14
| | | | | | | Also adds some debug info bug:8442036 Change-Id: Ife7fd4be664ae011e41969e74c7745da0a7a52f5