summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix jitter in FilmStripView.Angus Kong2013-05-201-14/+51
* 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
| |/
* | Add remove UI in FilmStripViewAngus Kong2013-05-165-58/+257
* | Merge "Add new camera activity back and fix build errors" into gb-ub-photos-c...Doris Liu2013-05-1612-3/+7226
|\ \
| * | Add new camera activity back and fix build errorsDoris Liu2013-05-1612-3/+7226
* | | 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 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-...Michael Kolb2013-05-151-1/+1
|\| |
| * | Merge "Correct label position after rotation" into gb-ub-photos-bryceMichael Kolb2013-05-151-1/+1
| |\ \
| | * | Correct label position after rotationMichael Kolb2013-05-141-1/+1
| | |/
* | | am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-...ztenghui2013-05-151-0/+8
|\| |
| * | Merge "Fix another annoying warning log spam" into gb-ub-photos-bryceztenghui2013-05-151-0/+8
| |\ \
| | * | Fix another annoying warning log spamztenghui2013-05-131-0/+8
| | |/
* | | Merge "Improve bitmap load efficiency." into gb-ub-photos-carlsbadAngus Kong2013-05-153-356/+524
|\ \ \
| * | | Improve bitmap load efficiency.Angus Kong2013-05-143-356/+524
* | | | am 26dbb20c: Merge "Pause face detection when review captured images" into gb...Doris Liu2013-05-141-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Pause face detection when review captured imagesDoris Liu2013-05-141-0/+2
| | |/ | |/|
* | | Fix FP rounding error for crop bounds.Ruben Brunk2013-05-141-5/+4
| |/ |/|
* | Dropping back FilmStripView codes.Angus Kong2013-05-133-0/+1541
* | 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-096-263/+5
|\|
| * Remove GL dependency on unused stencil buffers.George Mount2013-05-096-263/+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
* | | Merge "Fix bitmap buffer size." into gb-ub-photos-carlsbadGeorge Mount2013-05-091-1/+1
|\ \ \
| * | | Fix bitmap buffer size.George Mount2013-05-081-1/+1
* | | | am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryceBart Sears2013-05-081-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Close menu in onPause" into gb-ub-photos-bryceBart Sears2013-05-091-0/+1
| |\ \ \
| | * | | Close menu in onPauseMichael Kolb2013-05-081-0/+1
* | | | | am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryceMichael Kolb2013-05-083-24/+19
|\| | | |
| * | | | Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryceMichael Kolb2013-05-083-24/+19
| |\ \ \ \
| | * | | | Add drop shadow to preview thumbMichael Kolb2013-05-083-24/+19
| | |/ / /
* | | | | Merge "Remove new camera activity to avoid build breakage" into gb-ub-photos-...Doris Liu2013-05-0814-8827/+1
|\ \ \ \ \
| * | | | | Remove new camera activity to avoid build breakageDoris Liu2013-05-0814-8827/+1
* | | | | | am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into ...Sascha Haeberling2013-05-081-1/+8
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-...Sascha Haeberling2013-05-081-1/+8
| |\ \ \ \ | | |/ / / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 15:44:58 +0000