summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryceMichael Kolb2013-05-168-0/+0
|\
| * Add new overlay icons for sharpen and curvesMichael Kolb2013-05-168-0/+0
* | Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-165-10/+14
|\ \
| * | toUpper() some stringsJohn Reck2013-05-165-10/+14
| |/
* | Merge "Fix reset" into gb-ub-photos-bryceJohn Reck2013-05-161-0/+1
|\ \
| * | Fix resetJohn Reck2013-05-151-0/+1
| |/
* / change edit iconJohn Hoford2013-05-164-1/+1
|/
* 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
* | 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
| |/
* | 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 "Pause face detection when review captured images" into gb-ub-photos-bryceDoris Liu2013-05-141-0/+2
|\ \ \ | |_|/ |/| |
| * | Pause face detection when review captured imagesDoris Liu2013-05-141-0/+2
* | | Only link librsjni in unbundled branches.Tim Murray2013-05-131-1/+1
|/ /
* | Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
|\ \ | |/ |/|
| * New count down beeps.Doris Liu2013-05-132-0/+0
* | Remove GL dependency on unused stencil buffers.George Mount2013-05-096-263/+5
* | Merge "Fix the verbose log" into gb-ub-photos-bryceztenghui2013-05-091-3/+8
|\ \
| * | Fix the verbose logztenghui2013-05-081-3/+8
* | | Merge "Close menu in onPause" into gb-ub-photos-bryceBart Sears2013-05-091-0/+1
|\ \ \
| * | | Close menu in onPauseMichael Kolb2013-05-081-0/+1
* | | | Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryceMichael Kolb2013-05-087-24/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add drop shadow to preview thumbMichael Kolb2013-05-087-24/+20
| |/ /
* | | Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-...Sascha Haeberling2013-05-081-1/+8
|\ \ \ | |/ / |/| |
| * | Reduce max size of bitmap returned by crop dialog.Sascha Haeberling2013-05-081-1/+8
* | | Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-0845-279/+203
|\ \ \ | |_|/ |/| |
| * | Fix second level menuMichael Kolb2013-05-0845-279/+203
| |/
* | Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryceAngus Kong2013-05-0821-299/+0
|\ \
| * | DO NOT MERGE Further assets clean up.Angus Kong2013-05-0821-299/+0
| |/
* | Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryceBobby Georgescu2013-05-081-0/+2
|\ \ | |/ |/|
| * Fix memory leak in SparseArrayBitmapPoolBobby Georgescu2013-05-071-0/+2
* | Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryceDoris Liu2013-05-084-2/+14
|\ \
| * | Fix video capture intent overlapping buttonsDoris Liu2013-05-074-2/+14
* | | Merge "Add animation to slice selection" into gb-ub-photos-bryceMichael Kolb2013-05-081-1/+47
|\ \ \
| * | | Add animation to slice selectionMichael Kolb2013-05-071-1/+47
| |/ /
* | | Merge "Remove unused assets" into gb-ub-photos-bryceMichael Kolb2013-05-08183-0/+0
|\ \ \ | |_|/ |/| |
| * | Remove unused assetsMichael Kolb2013-05-07183-0/+0
| |/
* | Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-phot...Sascha Haeberling2013-05-072-3/+27
|\ \ | |/ |/|
| * Avoid rounding errors from cropping uncropped images.Sascha Haeberling2013-05-072-3/+27
* | Fix review button placementMichael Kolb2013-05-071-53/+66
* | Resize children to avoid laying out outside parentDoris Liu2013-05-061-16/+32
|/
* Merge "Fix black background on save progress indicator." into gb-ub-photos-bryceGeorge Mount2013-05-061-1/+1
|\
| * Fix black background on save progress indicator.George Mount2013-05-061-1/+1
* | Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryceMichael Kolb2013-05-064-65/+75
|\ \
| * | Fix lockscreen camera widget layoutMichael Kolb2013-05-064-65/+75
* | | Merge "Restrict checking for device flip" into gb-ub-photos-bryceDoris Liu2013-05-062-7/+20
|\ \ \ | |/ / |/| |
| * | Restrict checking for device flipDoris Liu2013-05-032-7/+20
* | | Set correct label text in tap modeMichael Kolb2013-05-061-0/+1
| |/ |/|