summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge "Make sure canceling a filter does not undo previous filter." into gb-u...Sascha Haeberling2013-05-201-18/+2
| |\ \ | | |/ | |/|
| | * Make sure canceling a filter does not undo previous filter.Sascha Haeberling2013-05-081-18/+2
* | | am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryceJohn Hoford2013-05-201-1/+15
|\| |
| * | Merge "Disable zoom" into gb-ub-photos-bryceJohn Hoford2013-05-201-1/+15
| |\ \
| | * | Disable zoomJohn Hoford2013-05-171-1/+15
* | | | am 1a266f16: Highlight selected option in FX and BordersMichael Kolb2013-05-176-13/+142
|\| | |
| * | | Highlight selected option in FX and BordersMichael Kolb2013-05-176-13/+142
| |/ /
* | | am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryceJohn Reck2013-05-161-3/+2
|\| |
| * | Switch back to old cropJohn Reck2013-05-161-3/+2
* | | am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-163-8/+10
|\| |
| * | Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-163-8/+10
| |\ \
| | * | toUpper() some stringsJohn Reck2013-05-163-8/+10
* | | | am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryceJohn Reck2013-05-161-0/+1
|\| | |
| * | | Fix resetJohn Reck2013-05-151-0/+1
| |/ /
* | | am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-p...Michael Kolb2013-05-151-3/+12
|\| |
| * | 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
* | | | am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-...ztenghui2013-05-151-0/+8
|\| | |
| * | | Fix another annoying warning log spamztenghui2013-05-131-0/+8
| |/ /
* | | Fix FP rounding error for crop bounds.Ruben Brunk2013-05-141-5/+4
* | | Revert "Reinitialize all the filters after Crop is applied."Ruben Brunk2013-05-104-25/+2
* | | Reinitialize all the filters after Crop is applied.Victor Doba2013-05-104-2/+25
* | | am ac94740c: Remove GL dependency on unused stencil buffers.George Mount2013-05-095-248/+5
|\| |
| * | Remove GL dependency on unused stencil buffers.George Mount2013-05-095-248/+5
* | | resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbadztenghui2013-05-091-3/+8
|\| |
| * | Merge "Fix the verbose log" into gb-ub-photos-bryceztenghui2013-05-091-3/+8
| |\ \ | | |/ | |/|
| | * Fix the verbose logztenghui2013-05-081-3/+8
* | | am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into ...Sascha Haeberling2013-05-081-1/+8
|\| |
| * | Reduce max size of bitmap returned by crop dialog.Sascha Haeberling2013-05-081-1/+8
| |/
* | am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." in...Sascha Haeberling2013-05-072-4/+28
|\|
| * Avoid rounding errors from cropping uncropped images.Sascha Haeberling2013-05-072-3/+27
* | am f469a168: Fix flashing (remove clipping)nicolasroard2013-05-011-2/+7
|\|
| * Fix flashing (remove clipping)nicolasroard2013-05-011-2/+7
* | am 00259461: Fix UInicolasroard2013-05-0110-43/+114
|\|
| * Fix UInicolasroard2013-05-0110-43/+114
* | am 5a352be0: Increase selection limitBobby Georgescu2013-05-011-1/+1
|\|
| * Increase selection limitBobby Georgescu2013-05-011-1/+1
* | 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
* | | fix crash due to no ImageFilterDrawJohn Hoford2013-05-011-1/+1
* | | resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbadJohn Hoford2013-05-0110-27/+42
|\ \ \ | |/ / |/| / | |/
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-2910-28/+43
* | Modifications for simple editnicolasroard2013-04-2913-76/+120
* | am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryceRuben Brunk2013-04-294-12/+99
|\|
| * Merge "Cleanup crop activity UI." into gb-ub-photos-bryceRuben Brunk2013-04-294-12/+99
| |\
| | * Cleanup crop activity UI.Ruben Brunk2013-04-264-12/+99
* | | am 384971f7: Instrument importer for usage statisticsBobby Georgescu2013-04-293-6/+16
|\| |
| * | Instrument importer for usage statisticsBobby Georgescu2013-04-283-6/+16
* | | am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-...Bobby Georgescu2013-04-261-0/+9
|\| |
| * | Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryceBobby Georgescu2013-04-261-0/+9
| |\ \