summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix border apply if no filter appliednicolasroard2013-04-172-6/+19
* Merge "Revert "Shows final set of filters in UI."" into gb-ub-photos-carlsbadRuben Brunk2013-04-171-4/+4
|\
| * Revert "Shows final set of filters in UI."Ruben Brunk2013-04-161-4/+4
* | am 83bd8d34: Remove History panelnicolasroard2013-04-163-111/+3
|\ \ | |/ |/|
| * Remove History panelnicolasroard2013-04-163-111/+3
* | am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryceRuben Brunk2013-04-161-4/+4
|\|
| * Merge "Shows final set of filters in UI." into gb-ub-photos-bryceRuben Brunk2013-04-161-4/+4
| |\
| | * Shows final set of filters in UI.Ruben Brunk2013-04-161-4/+4
* | | Re-enable Simple Editor menu itemnicolasroard2013-04-161-1/+1
* | | am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryceDoris Liu2013-04-161-2/+2
|\| |
| * | Merge "Fix face unlock failure" into gb-ub-photos-bryceDoris Liu2013-04-161-2/+2
| |\ \
| | * | Fix face unlock failureDoris Liu2013-04-161-2/+2
* | | | am 03332473: Make convertBitmap() protected so that Frames can use it.nicolasroard2013-04-160-0/+0
|\| | |
| * | | Make convertBitmap() protected so that Frames can use it.nicolasroard2013-04-161-1/+1
* | | | Merge "Add accessibility to video player controller." into gb-ub-photos-carlsbadztenghui2013-04-161-5/+18
|\ \ \ \
| * | | | Add accessibility to video player controller.ztenghui2013-04-161-5/+18
* | | | | am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-p...nicolasroard2013-04-161-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-brycenicolasroard2013-04-161-1/+1
| |\ \ \ \
| | * | | | Remove the Simple Edit menu item in Gallerynicolasroard2013-04-161-1/+1
* | | | | | am bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.Angus Kong2013-04-161-12/+3
|\| | | | |
| * | | | | Don't wait for Mosaic Renderer ready in UI thread.Angus Kong2013-04-161-12/+3
| |/ / / /
* | | | | am fb6a8e16: New state panelnicolasroard2013-04-1611-42/+946
|\| | | |
| * | | | New state panelnicolasroard2013-04-1511-42/+946
* | | | | convertBitmap is needed by ImageFilterFixedFrame.Christian Wichner2013-04-161-1/+1
* | | | | Add local database for filters.Ruben Brunk2013-04-152-0/+244
* | | | | am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryceMichael Kolb2013-04-151-6/+34
|\| | | |
| * | | | Merge "Angle menu at edge of screen" into gb-ub-photos-bryceMichael Kolb2013-04-161-6/+34
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Angle menu at edge of screenMichael Kolb2013-04-151-6/+34
* | | | | am f7771f98: Use extra copy of parameters for concurrent accessAngus Kong2013-04-155-25/+19
|\| | | | | |_|/ / |/| | |
| * | | Use extra copy of parameters for concurrent accessAngus Kong2013-04-155-25/+19
* | | | am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryceMichael Kolb2013-04-151-0/+5
|\| | |
| * | | Also, add labels to video menuMichael Kolb2013-04-151-0/+5
| |/ /
* | | am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryceMichael Kolb2013-04-157-4/+85
|\| |
| * | Merge "Add menu labels" into gb-ub-photos-bryceMichael Kolb2013-04-157-4/+85
| |\ \
| | * | Add menu labelsMichael Kolb2013-04-157-4/+85
* | | | am 3dc6a630: Merge "Fix performance and other issues related to multi-selecti...Bobby Georgescu2013-04-152-25/+68
|\| | |
| * | | Merge "Fix performance and other issues related to multi-selection" into gb-u...Bobby Georgescu2013-04-152-25/+68
| |\ \ \
| | * | | Fix performance and other issues related to multi-selectionBobby Georgescu2013-04-122-25/+68
* | | | | am d2f5fe60: support for simplified parameters in filterJohn Hoford2013-04-157-0/+296
|\| | | |
| * | | | support for simplified parameters in filterJohn Hoford2013-04-157-0/+296
| | |/ / | |/| |
* | | | am 4b6ea5bc: Add direct rendering for bordernicolasroard2013-04-132-0/+17
|\| | |
| * | | Add direct rendering for bordernicolasroard2013-04-122-0/+17
| |/ /
* / / Load video items in the new camera filmstrip.Angus Kong2013-04-122-34/+214
|/ /
* | Add a direct rendering modenicolasroard2013-04-125-0/+106
* | Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryceMichael Kolb2013-04-121-22/+31
|\ \
| * | Add checks for NPE in video pie menu.Jason Noguchi2013-04-111-22/+31
* | | Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryceMichael Kolb2013-04-121-1/+1
|\ \ \
| * | | Fix NPE in PieRendererMichael Kolb2013-04-121-1/+1
* | | | Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryceDoris Liu2013-04-121-19/+27
|\ \ \ \
| * | | | Fix ICS recording aspect ratioDoris Liu2013-04-111-19/+27
| | |/ / | |/| |