summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
Commit message (Expand)AuthorAgeFilesLines
* Create RenderScript ScriptC without resourceID.Miao Wang2015-07-295-6/+5
* Fix RenderScript warnings.Jean-Luc Brouillet2015-05-262-5/+2
* Use java.util.Date instead of java.sql.Date.Narayan Kamath2015-03-172-2/+2
* am 3ffc2889: Merge "Remove dependencies on FloatMath"Neil Fuller2014-10-1710-33/+25
|\
| * Remove dependencies on FloatMathNeil Fuller2014-10-0210-33/+25
| * Merge commit 'a9c4376daac3b9deda0c617b6df393e741885f37' into HEADBill Yi2014-04-291-0/+3
| |\
| | * am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"Nick Kralevich2014-03-071-1/+1
| | |\
* | | | Start new task for Gallery trampolinesAlan Newberger2014-08-081-0/+1
* | | | Call setLocalMatrix before setShader. do not mergeLeon Scroggins III2014-07-151-2/+3
* | | | Update ingest importer codeBobby Georgescu2014-05-1422-2292/+2922
* | | | am 3d736418: Merge "Use basic editor for sharpen filter."Alan Newberger2014-04-221-1/+2
|\| | |
| * | | Use basic editor for sharpen filter.Jun Su2014-02-231-1/+2
| | |/ | |/|
* | | am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"Nick Kralevich2014-02-011-1/+1
|\| | | |/ |/|
| * gallery: change typo '&&' to '||'Leavitt Zhang2014-01-281-1/+1
* | am 91628475: am 947478b6: am aa22947b: Fix the thumbnail generation.ztenghui2013-11-181-0/+3
|\ \ | |/ |/|
| * Fix the thumbnail generation.ztenghui2013-11-181-0/+3
* | am 350f7e3d: am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialognicolasroard2013-11-041-1/+1
|\|
| * Fix infinite spinner dialognicolasroard2013-11-011-1/+1
* | am c23e8d86: am 07986225: am c82e65b4: Merge "Disable geometry button if tiny...nicolasroard2013-11-042-0/+8
|\|
| * Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carl...nicolasroard2013-11-022-0/+8
| |\
| | * Disable geometry button if tiny planet is herenicolasroard2013-11-012-0/+8
* | | am d5dbfe7b: am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" i...John Hoford2013-11-041-0/+1
|\| |
| * | fix Gallery crash using cropJohn Hoford2013-11-011-0/+1
| |/
* | am 2c237f11: Merge "Fix invalid private access."Narayan Kamath2013-10-311-2/+2
|\ \ | |/ |/|
| * Fix invalid private access.Narayan Kamath2013-10-311-2/+2
| * am a4d93ac0: Fix text size in the state panelnicolasroard2013-06-111-0/+1
| |\
| | * Fix text size in the state panelnicolasroard2013-06-111-0/+1
| * | am 536c651c: am 8bb4e1a0: Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
| |\|
| | * am 8bb4e1a0: Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
| | |\
| * | | am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active ...Bobby Georgescu2013-05-281-2/+1
| |\| |
| | * | am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" in...Bobby Georgescu2013-05-281-2/+1
| | |\ \
| * | | | am 7b3d8d85: am a7a6a3a5: Fix issues with LocalJohn Hoford2013-05-231-0/+1
| |\| | |
| | * | | am a7a6a3a5: Fix issues with LocalJohn Hoford2013-05-231-0/+1
| | |\ \ \
| * | | | | am 3d4fbf40: am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-p...John Hoford2013-05-221-4/+21
| |\| | | |
| | * | | | am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryceJohn Hoford2013-05-221-4/+21
| | |\ \ \ \
| * | | | | | am 02593125: am be4f113f: Fix editor on ICSMichael Kolb2013-05-221-1/+1
| |\| | | | |
| | * | | | | am be4f113f: Fix editor on ICSMichael Kolb2013-05-221-1/+1
| | |\ \ \ \ \
| * | | | | | | am 7da344a4: am 37be6658: Merge "Fix selection highlight for tablets" into gb...Michael Kolb2013-05-212-2/+25
| |\| | | | | |
| | * | | | | | am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-212-2/+25
| | |\ \ \ \ \ \
| * | | | | | | | am 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryceJohn Reck2013-05-211-1/+2
| |\| | | | | | |
| | * | | | | | | am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryceJohn Reck2013-05-211-1/+2
| | |\ \ \ \ \ \ \
| * | | | | | | | | am bfce0515: am aa77f39a: Merge "Fix camera controls blink on startup" into g...Doris Liu2013-05-211-0/+5
| |\| | | | | | | |
| | * | | | | | | | am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-b...Doris Liu2013-05-211-0/+5
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | am c6038e29: am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into...John Hoford2013-05-211-1/+5
| |\| | | | | | | | |
| | * | | | | | | | | am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos...John Hoford2013-05-211-1/+5
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am 96c48dee: am 286afab1: Merge "Avoid using region decoder for bad image typ...Ruben Brunk2013-05-201-26/+50
| |\| | | | | | | | | |
| | * | | | | | | | | | am 286afab1: Merge "Avoid using region decoder for bad image types when setti...Ruben Brunk2013-05-201-26/+50
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am f2697daa: am 7af7156a: Merge "Make sure canceling a filter does not undo p...Sascha Haeberling2013-05-201-18/+2
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am 7af7156a: Merge "Make sure canceling a filter does not undo previous filte...Sascha Haeberling2013-05-201-18/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am 22fcfeb2: am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryceJohn Hoford2013-05-201-1/+15
| |\| | | | | | | | | | | |