summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow
Commit message (Collapse)AuthorAgeFilesLines
* Fixes save filename for panos after edit.Ruben Brunk2013-06-031-3/+36
| | | | | Bug: 9258209 Change-Id: Ib7404242e5886a38b9e6f9fd6f28a52f1a703590
* am 8bb4e1a0: Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
|\ | | | | | | | | * commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9': Fixes reading exif tags in editor.
| * Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
| | | | | | | | | | Bug: 9140401 Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
* | 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
* | Cleaning up ImageShow.Ruben Brunk2013-05-297-217/+25
| | | | | | | | | | Bug: 9170644 Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
* | Merge "zoom to center of double tap" into gb-ub-photos-carlsbadJohn Hoford2013-05-292-1/+24
|\ \
| * | zoom to center of double tapJohn Hoford2013-05-282-1/+24
| | | | | | | | | | | | Change-Id: Idfc257f92dd1a97d9109b9f5325299b8e1432c37
* | | Removed unused ZoomCache class.Ruben Brunk2013-05-282-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9170644 Note: this class doesn't appear to have been used by the zoom on doubletap. Change-Id: Ie3319511ade7732976488f2bb7d76c5e1c130db9
* | | Removed unused handling for intent extras in editor.Ruben Brunk2013-05-284-305/+32
| | | | | | | | | | | | | | | Bug: 9170644 Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
* | | functionality added to transport filter parameter values to following ↵Christian Wichner2013-05-242-0/+33
| | | | | | | | | | | | | | | | | | filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame. Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3
* | | am a7a6a3a5: Fix issues with LocalJohn Hoford2013-05-231-0/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d': Fix issues with Local
| * | Fix issues with LocalJohn Hoford2013-05-221-0/+1
| | | | | | | | | | | | | | | bug:9085638 Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
* | | am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryceJohn Hoford2013-05-221-4/+21
|\| | | | | | | | | | | | | | * commit '4d25d129d1c9f92033382e12260d3f40521cf3fd': fix ellipse logic for portrait
| * | Merge "fix ellipse logic for portrait" into gb-ub-photos-bryceJohn Hoford2013-05-221-4/+21
| |\ \
| | * | fix ellipse logic for portraitJohn Hoford2013-05-211-4/+21
| | | | | | | | | | | | | | | | | | | | bug:9054114 Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec
* | | | am be4f113f: Fix editor on ICSMichael Kolb2013-05-221-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba': Fix editor on ICS
| * | | Fix editor on ICSMichael Kolb2013-05-221-1/+1
| |/ / | | | | | | | | | | | | | | | Bug: 9079902 Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14
* | | am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-222-2/+25
|\| | | | | | | | | | | | | | * commit '37be6658075cac2bad0e30d93705dddeaaf1e421': Fix selection highlight for tablets
| * | Merge "Fix selection highlight for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-212-2/+25
| |\ \
| | * | Fix selection highlight for tabletsMichael Kolb2013-05-212-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9044356 Fixes selection highlight for the new asset sizes. Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a
* | | | am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryceJohn Reck2013-05-221-1/+2
|\| | | | |_|/ |/| | | | | | | | * commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc': Fix height
| * | Fix heightJohn Reck2013-05-211-1/+2
| | | | | | | | | | | | Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
* | | am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into ↵John Hoford2013-05-211-1/+5
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'a285bc130ff1175c60085410f317e90f6443c39b': fix TinyPlanets Filter landscape crash
| * | fix TinyPlanets Filter landscape crashJohn Hoford2013-05-201-1/+5
| |/ | | | | | | | | bug:9038163 Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
* | am 286afab1: Merge "Avoid using region decoder for bad image types when ↵Ruben Brunk2013-05-201-26/+50
|\| | | | | | | | | | | | | setting wallpaper." into gb-ub-photos-bryce * commit '286afab10fb4c528ea503981c4f1bdbcfbdbde77': Avoid using region decoder for bad image types when setting wallpaper.
| * Merge "Avoid using region decoder for bad image types when setting ↵Ruben Brunk2013-05-201-26/+50
| |\ | | | | | | | | | wallpaper." into gb-ub-photos-bryce
| | * Avoid using region decoder for bad image types when setting wallpaper.Ruben Brunk2013-05-201-26/+50
| | | | | | | | | | | | | | | Bug: 8893617 Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe
* | | am 7af7156a: Merge "Make sure canceling a filter does not undo previous ↵Sascha Haeberling2013-05-201-18/+2
|\| | | | | | | | | | | | | | | | | | | | filter." into gb-ub-photos-bryce * commit '7af7156a809934951877b1f9b9ad1ceeb9c9a5ce': Make sure canceling a filter does not undo previous filter.
| * | Merge "Make sure canceling a filter does not undo previous filter." into ↵Sascha Haeberling2013-05-201-18/+2
| |\ \ | | |/ | |/| | | | gb-ub-photos-bryce
| | * Make sure canceling a filter does not undo previous filter.Sascha Haeberling2013-05-081-18/+2
| | | | | | | | | | | | | | | | | | Bug: 8770921 Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
* | | am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryceJohn Hoford2013-05-201-1/+15
|\| | | | | | | | | | | | | | * commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8': Disable zoom
| * | Merge "Disable zoom" into gb-ub-photos-bryceJohn Hoford2013-05-201-1/+15
| |\ \
| | * | Disable zoomJohn Hoford2013-05-171-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
* | | | am 1a266f16: Highlight selected option in FX and BordersMichael Kolb2013-05-176-13/+142
|\| | | | | | | | | | | | | | | | | | | * commit '1a266f16edbef7cb0a770d37fcad958fc55a5862': Highlight selected option in FX and Borders
| * | | Highlight selected option in FX and BordersMichael Kolb2013-05-176-13/+142
| |/ / | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
* | | am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-163-8/+10
|\| | | | | | | | | | | | | | * commit '75084da1b34e0ff9f269b5409d206c213532edbc': toUpper() some strings
| * | Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-163-8/+10
| |\ \
| | * | toUpper() some stringsJohn Reck2013-05-163-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
* | | | am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryceJohn Reck2013-05-161-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195': Fix reset
| * | | Fix resetJohn Reck2013-05-151-0/+1
| |/ / | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec
* | | am c2f813a3: Merge "Grey out undo/redo/reset according to state" into ↵Michael Kolb2013-05-151-3/+12
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'c2f813a36711742af3b23743ef1849cec13a9a95': Grey out undo/redo/reset according to state
| * | Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryceMichael Kolb2013-05-151-3/+12
| |\ \
| | * | Grey out undo/redo/reset according to stateMichael Kolb2013-05-141-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827
* | | | am 4aa8d5fc: Merge "Fix another annoying warning log spam" into ↵ztenghui2013-05-151-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426': Fix another annoying warning log spam
| * | | Fix another annoying warning log spamztenghui2013-05-131-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | bug:8771541 When we set up the icon rendering, we need to set the geometry, too. Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92
* | | Fix FP rounding error for crop bounds.Ruben Brunk2013-05-141-5/+4
| | | | | | | | | | | | | | | Bug: 8874599 Change-Id: I94198e4dcdbb0afa1dd788130645855b33e8f30b
* | | 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