summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix icon sizes and jaggiesnicolasroard2013-06-114-2/+19
* Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carl...Doris Liu2013-06-111-1/+10
|\
| * Disable zoom when camera does not support zoomDoris Liu2013-06-111-1/+10
* | Fix text size in the state panelnicolasroard2013-06-101-0/+4
* | Fix warningsnicolasroard2013-06-101-3/+3
|/
* Add a layout for undo barDoris Liu2013-06-053-2/+65
* Merge "Removing unused UI fields in FilterRepresentation." into gb-ub-photos-...Ruben Brunk2013-06-0510-70/+22
|\
| * Removing unused UI fields in FilterRepresentation.Ruben Brunk2013-06-0510-70/+22
* | Remove the frameLayout wrapping CameraRootViewDoris Liu2013-06-041-10/+4
* | Merge "Add secure camera support." into gb-ub-photos-carlsbadAngus Kong2013-06-041-0/+23
|\ \ | |/ |/|
| * Add secure camera support.Angus Kong2013-06-031-0/+23
* | am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-06-030-0/+0
|\ \ | |/ |/|
| * Import translations. DO NOT MERGEBaligh Uddin2013-06-0349-0/+116
* | Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbadztenghui2013-06-031-3/+5
|\ \
| * | Add LUT3D filter state savingztenghui2013-05-311-3/+5
* | | am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-06-010-0/+0
|\ \ \ | | |/ | |/|
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-05-3129-58/+29
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-05-2929-58/+29
* | | | Improve gesture handlingDoris Liu2013-05-313-175/+73
* | | | Mirroring google3 for CL 47368174.Ruben Brunk2013-05-301-0/+5
* | | | am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-302-0/+8
|\| | |
| * | | Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-302-0/+8
| |\ \ \ | | |/ / | |/| |
| | * | Add HTC One picture resolutionsMichael Kolb2013-05-302-0/+8
* | | | am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-05-290-0/+0
|\| | | | |_|/ |/| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-05-2749-0/+79
| |/
* | Cleaning up ImageShow.Ruben Brunk2013-05-292-59/+49
* | Add UI for insertion in FilmStripView.Angus Kong2013-05-281-0/+1
* | Merge "functionality added to transport filter parameter values to following ...Christian Wichner2013-05-271-0/+24
|\ \
| * | functionality added to transport filter parameter values to following filters...Christian Wichner2013-05-241-0/+24
* | | am 461e101f: Add 13MP resolutionMichael Kolb2013-05-242-0/+4
|\ \ \ | |/ / |/| / | |/
| * Add 13MP resolutionMichael Kolb2013-05-242-0/+4
* | Merge "Make preview size smaller so that low-res images come in faster." into...George Mount2013-05-211-1/+1
|\ \
| * | Make preview size smaller so that low-res images come in faster.George Mount2013-05-211-1/+1
* | | am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-05-170-0/+0
|\ \ \ | | |/ | |/|
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-05-171-6/+6
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-05-171-6/+6
* | | | am 1a266f16: Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
|\| | |
| * | | Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
| |/ /
* | | Merge "Add new camera activity back and fix build errors" into gb-ub-photos-c...Doris Liu2013-05-165-0/+502
|\ \ \ | |_|/ |/| |
| * | Add new camera activity back and fix build errorsDoris Liu2013-05-165-0/+502
* | | am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-...Michael Kolb2013-05-168-0/+0
|\ \ \ | | |/ | |/|
| * | 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
* | | | am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-162-2/+4
|\| | |
| * | | Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-162-2/+4
| |\ \ \
| | * | | toUpper() some stringsJohn Reck2013-05-162-2/+4
| | |/ /
* | | / am fef58a0f: change edit iconJohn Hoford2013-05-164-1/+1
|\| | | | |_|/ |/| |
| * | change edit iconJohn Hoford2013-05-164-1/+1
| |/
* | am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
|\|
| * Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
| |\