summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: Translate image draw to Chinesekaiyiz2015-02-153-7/+11
| | | | | | | | | The name of FilterDrawRepresentation is set 'Draw' constant. Set name of FilterDrawRepresentation from imageDraw in filter_string. Change-Id: If4ee1c4e96e52cd267c90afde1081d5b68f4d206 CRs-Fixed: 794963
* Merge "Gallery2: Edit picture during mount SD"Linux Build Service Account2015-01-221-1/+1
|\
| * Gallery2: Edit picture during mount SDkaiyiz2015-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | When SD card is mounted, the data of picture can't read to get mime type. As a result, there will be NullPointerException happen for the mimeType's value is null Change position of 'mimeType' and 'JPEG_MIME_TYPE', so that the judgement can go well without NullPointerException CRs-Fixed: 783875 Change-Id: I0d48b4ade06dba1c23a76b9046163a027f38e514
* | Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-01-201-0/+6
|/ | | | | | - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
* Merge "Gallery2: Fix color chooser"Linux Build Service Account2015-01-172-1/+13
|\
| * Gallery2: Fix color chooserkaiyiz2015-01-142-1/+13
| | | | | | | | | | | | | | | | | | | | | | There is another problem for this issue: the border of color is not set well for the flag of mSelectedButton. Set mSelectedButton when set up. CRs-Fixed: 764078 Change-Id: Ibaddb66abe425bdc95a1f78a58522a3b4449ae80
* | Gallery2: Add null pointer judgement for monkeykaiyiz2015-01-122-1/+4
|/ | | | | | | | | | | The master image's parameters are null, as a result, there is a lot of NullPointerException during Monkey test. Add some judgement before using these parameters, return if null. CRs-Fixed: 770284 Change-Id: Ie8825f920ced2261908c19555173d36fdebca5a1
* Gallery2: Fix crop after straighten bugkaiyiz2015-01-031-0/+3
| | | | | | | | | | | | During straighten and crop, there will be a crop Rect exits, the comparement of these two Rect is not perfect, so the two rect is considered to be different, and the Representation is wrong. Set the origenal Rect equals to representation. CRs-Fixed: 766877 Change-Id: Id76dfef360cdaff109cdce505cb5f289691645c6
* Merge "Gallery2: Fix monkey test fail"Linux Build Service Account2014-12-173-3/+15
|\
| * Gallery2: Fix monkey test failkaiyiz2014-12-033-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | When click undo in filtershowActivity,the position can't be -1 In FilterShowActivity,the preset and Rect shouldn't be null. Add some check for position and null pointer check for preset and rect CRs-fixed: 693810 Change-Id: I70fa2ff86d40ad483474b60ab9071ccb151bd445
* | Gallery2: Fix cropped picture cannot be saved.kayiz2014-12-121-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When click the saveButton to save the cropped picture, We found the source picture uri and the cropped picture uri are the same,which cause the cropped picture can not be saved. Closed file Stream of mInStream before re-open it for the same file. CRs-Fixed: 622666 Change-Id: Ifcaa39ea76c141021259fad891411c59f7587903
* | Gallery2: Change method for Filter comparekaiyiz2014-12-051-1/+1
|/ | | | | | | | | | | | | The method of 'same' compare the class between two FilterRepresentation, and the method of 'equal' compare everything between two FilterRepresentation. Since two border have the same class of 'ImageFilterBorder', they are considered no diff in method of 'same'. Change the method 'same' to 'equal'. CRs-Fixed: 759358 Change-Id: I80dda9295555181d70c90bd893ea2c3efb7d41e3
* Gallery2: Fix undo button enable conditionkaiyiz2014-11-301-1/+1
| | | | | | | | | | | | When jump into interface of Image edit, the undo button is enable at first, for the judgement of canUndo is set true, but actually there is nothing to undo. Change canUndo's judging condition. CRs-Fixed: 759431 Change-Id: Idae9feaca62b5cdc67610cf332c2b65f1692dbb4
* Gallery2: Fix the border name display abnormallykaiyiz2014-11-041-12/+3
| | | | | | | | | The border name display abnormally Make the border name display normally Change-Id: Id237236830a272abd958e033315b0e70eff6ff38 CRs-fixed: 740974
* Gallery2: fix can not add gallery widget to home screenkaiyiz2014-11-041-1/+1
| | | | | | | | | | | | | When selected to add a cropped picture to home screen, the binder transaction failed because it was too large, add widget failed. We reduce the allowed maximum bitmap size in intent, to make sure that binder size will not greater than 1M. CRs-Fixed: 528927 Change-Id: Id63c8503dead66ab18531a78b0b4206d1fd30d07
* Gallery2: Make icon display completely.kaiyiz2014-11-041-1/+1
| | | | | | | | | | The icon size is to big for the device screen. Adjust the icon size to the right width. CRs-fixed: 639562 Change-Id: Ibde082d48d4f12009f5293de049798cf221adda4
* Gallery2: Fix the original picture not display after edit.kaiyiz2014-11-041-4/+4
| | | | | | | | | Not move the origianl picture to auxiliary directory and insert the edited picture record to the database. CRs-fixed: 714431 Change-Id: I5b8fce7b24cc812463282d114094356707c2096c
* Fixed NullPointerException when EXIF data is invalidUday Kiran jandhyala2014-11-042-0/+6
| | | | | | | For some images with no / invalid EXIF data, Gallery crashes Fixed this bug by catching NullPointerException Change-Id: I656fe6d526c981933c3d6eeefe67cda860206e2d
* Use WeakReferenes to reduce Bitmap memory footprintUday Kiran jandhyala2014-11-041-3/+4
| | | | | | | | | | | Use HashMap<Integer, WeakReference<Drawable>> instead of just HashMap<Integer, Drawable> Without this, references are still being held for Bitmap drawables, thereby after few Photo edits, OutOfMemoryException is raised and Gallery crashes Change-Id: If91f950986bd816d5571a0d51a7cb9522226e270
* Call setLocalMatrix before setShader. do not mergeLeon Scroggins III2014-07-151-2/+3
| | | | | | | | | Now that setLocalMatrix does not modify associated Paints, we need to call it before assigning the Shader to the Paint. BUG:14315916 Change-Id: I6778a35eff36515e18c53a979dd69d8aecd1401d (cherry picked from commit ce3b2ee2c6512a0eac9dbd54641a196baa68ba3f)
* am 3d736418: Merge "Use basic editor for sharpen filter."Alan Newberger2014-04-221-1/+2
|\ | | | | | | | | * commit '3d73641843682089be63cd248465497f007b93a1': Use basic editor for sharpen filter.
| * Use basic editor for sharpen filter.Jun Su2014-02-231-1/+2
| | | | | | | | | | | | | | | | | | Currently gallery's sharpen filter is relate to the editor id = R.id.imageShow, which is not point to any valid editor. As a result native gallery sharpen function will cause exception and fail. Change to use basic editor. Change-Id: I2a04ab81c395e12004cd6fe4635932a19c1c39be
* | Fix the thumbnail generation.ztenghui2013-11-181-0/+3
|/ | | | | bug:11664501 Change-Id: I53ec5a08e801d0300b8ed159158bc46f61c6d3f4
* Fix infinite spinner dialognicolasroard2013-11-011-1/+1
| | | | | | bug:11328106 Change-Id: Icbfcb7bb6c88a03c81315789b2569da440267edd
* Merge "Disable geometry button if tiny planet is here" into ↵nicolasroard2013-11-022-0/+8
|\ | | | | | | gb-ub-photos-carlsbad
| * Disable geometry button if tiny planet is herenicolasroard2013-11-012-0/+8
| | | | | | | | | | bug:11288853 Change-Id: I818f406eb25e0f82c89ffde0bd91d2aa8ab31b94
* | fix Gallery crash using cropJohn Hoford2013-11-011-0/+1
|/ | | | | bug:11347083 Change-Id: Ic5417d12e0b1cee181ddad8d581eddc6aeb8a5b8
* fix crop not supporting non-normal orientationJohn Hoford2013-10-221-26/+42
| | | | | bug:11324471 Change-Id: Ib4a76ac1540700eeaa4ddd727b06f9a29b999827
* Fix crash when exporting with null fxnicolasroard2013-10-211-1/+1
| | | | | bug:11281209 Change-Id: I71837bcb18b75201542309f71f99ba7abfb65f93
* Handles export size zeronicolasroard2013-10-212-2/+14
| | | | | bug:11280447 Change-Id: Ia8758a6d269b4ac9fdc9435b3bcdf9295c3e11a9
* Fix wrong applied fxnicolasroard2013-10-161-1/+1
| | | | | | | Typo in serialization name causes the wrong effect to be applied bug:11260854 Change-Id: I2d939f49edb7cc61f564bb1e2e6cfa6aad37164c
* Fix crash "Gallery has stopped" popup occurs during print setupnicolasroard2013-10-152-2/+2
| | | | | bug:11159662 Change-Id: I181fe6f581290067b9a39d1382bf6ede08484c0a
* fix Vignette collapse to a lineJohn Hoford2013-10-141-0/+2
| | | | | bug:11221755 Change-Id: Ibe04770d0cfd3fe596ef72e86ccfe461c0cf63b1
* Fix showing the wrong image after animationnicolasroard2013-10-112-15/+14
| | | | | bug:10856175 Change-Id: I87d2bcd1bb1a4ee28536a97f018b6a3cf409d1b8
* Process correctly an export when called with EDIT intentnicolasroard2013-10-114-19/+37
| | | | | bug:11159123 Change-Id: I8c827d9f757c4fd00d21753753917b62d5ba0213
* Merge "fix showing wrong image post save" into gb-ub-photos-carlsbadJohn Hoford2013-10-123-5/+31
|\
| * fix showing wrong image post saveJohn Hoford2013-10-113-5/+31
| | | | | | | | | | | | bug:11174327 bug:11130809 Change-Id: I53ee2f73c5a871d9255fea547a0d93a989f15a4f
* | fixed crash when applying the none filterJohn Hoford2013-10-111-1/+1
|/ | | | | bug:11188884 Change-Id: Id1f5e72b15b307eedccd5d582d3632500f19fdbd
* Merge "Fix crash" into gb-ub-photos-carlsbadnicolasroard2013-10-111-2/+3
|\
| * Fix crashnicolasroard2013-10-111-2/+3
| | | | | | | | | | bug:11185130 Change-Id: I8aaaeb706cb0b2db106c266a84dad0e55d76998f
* | Merge "fix RTL menu issues" into gb-ub-photos-carlsbadJohn Hoford2013-10-111-1/+1
|\ \
| * | fix RTL menu issuesJohn Hoford2013-10-111-1/+1
| | | | | | | | | | | | | | | bug:11184806 Change-Id: I4562b13afc34069ed72a7bf497825abdd57a00ba
* | | Introduce FilterShowHelper for versioning visibilityAlan Newberger2013-10-111-8/+13
| | | | | | | | | | | | | | | | | | | | | This CL creates FilterShowHelper which will first be used to ensure Versions is active. Bug: 10734094 Change-Id: I7ac7d99af8818e2599ea2f2a0e64b9c3433a9002
* | | Use AOSP borders by defaultnicolasroard2013-10-101-0/+69
| |/ |/| | | | | | | | | bug:11132358 bug:11130809 Change-Id: I57bcfeec35cde1095df5c26776aaa1a06cd110aa
* | Fix edge case cache issuesnicolasroard2013-10-101-2/+26
|/ | | | | | | | Also add additional debugging information. bug:10856175 Change-Id: Ie352e2dd6a86511abea97b622ed7c3b3cccd8479
* Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbadJohn Hoford2013-10-098-2/+35
|\
| * hide popupmenu during rotateJohn Hoford2013-10-098-2/+35
| | | | | | | | | | bug:11135309 Change-Id: I5954fafe1f081f8d1fc30c36f5cf6b2c66cb9511
* | Add missing flag for bounds decodenicolasroard2013-10-081-0/+1
| | | | | | | | | | | | bug:11140621 Change-Id: I08af1a6dd9527a03b21d7ab0c3cff776f37201ac
* | Fix triple buffer update bugnicolasroard2013-10-081-0/+6
|/ | | | | | bug:11140550 Change-Id: I530bf8b071c7336eb7a20293d6c9c2f5360df47e
* Switch Gallery2 to use the support lib for printing.Svetoslav Ganov2013-10-071-3/+4
| | | | | | | | | | | | | Now we have a class in the support library that uses a correct internal implemetation based on the API level. On older devices the app does not crash and on new devices it can print. Also this class does the heavy lifiting. Gallery2 was not using this class, rather it had its own (obsolete) implemetation that was not taking into account the image aspect ratio to provide a hint to the print system for the orientation to be used. bug:11099831 Change-Id: I4cd260614af4d9d87ec31d205ee2a5ef02ef5417