summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix icon sizes and jaggiesnicolasroard2013-06-114-2/+19
| | | | | | bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
* Merge "Disable zoom when camera does not support zoom" into ↵Doris Liu2013-06-111-1/+10
|\ | | | | | | gb-ub-photos-carlsbad
| * Disable zoom when camera does not support zoomDoris Liu2013-06-111-1/+10
| | | | | | | | Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
* | Fix text size in the state panelnicolasroard2013-06-101-0/+4
| | | | | | | | Change-Id: I0290b2039d987605e3cc82e3c4d486b7855059b2
* | Fix warningsnicolasroard2013-06-101-3/+3
|/ | | | Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
* Add a layout for undo barDoris Liu2013-06-053-2/+65
| | | | Change-Id: Id795f00c8ca5f147f6aae8c1f9cba4e1da1e5b20
* Merge "Removing unused UI fields in FilterRepresentation." into ↵Ruben Brunk2013-06-0510-70/+22
|\ | | | | | | gb-ub-photos-carlsbad
| * Removing unused UI fields in FilterRepresentation.Ruben Brunk2013-06-0510-70/+22
| | | | | | | | | | | | Bug: 9170644 Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
* | Remove the frameLayout wrapping CameraRootViewDoris Liu2013-06-041-10/+4
| | | | | | | | Change-Id: I5a238766b54d3f36c929c53225367cddf90473f9
* | 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
| | | | | | | | Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
* | am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-06-030-0/+0
|\ \ | |/ |/| | | | | | | | | gb-ub-photos-bryce * commit 'e40d9a1e39596220d1949b869ed4c167ca8e63a5': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEBaligh Uddin2013-06-0349-0/+116
| | | | | | | | | | Change-Id: I8b878349f27250babd1dc79b0a152ae19293242e Auto-generated-cl: translation import
* | Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbadztenghui2013-06-031-3/+5
|\ \
| * | Add LUT3D filter state savingztenghui2013-05-311-3/+5
| | | | | | | | | | | | Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018
* | | am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-06-010-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | gb-ub-photos-bryce * commit '6d1345aa496d9f5caedae6b3b0c5b6132fb01893': Import translations. DO NOT MERGE
| * | 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
| | | | | | | | | | | | | | | | | | | | Change-Id: I1d9ab8dc2f246b9456ba677ee3a657306fbefcb7 Auto-generated-cl: translation import
* | | | Improve gesture handlingDoris Liu2013-05-313-175/+73
| | | | | | | | | | | | | | | | Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
* | | | Mirroring google3 for CL 47368174.Ruben Brunk2013-05-301-0/+5
| | | | | | | | | | | | | | | | Change-Id: Ic29d8d6784870660e0bd83f870ec2cf0c244746d
* | | | am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-302-0/+8
|\| | | | | | | | | | | | | | | | | | | * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
* | | | am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-05-290-0/+0
|\| | | | |_|/ |/| | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'b375339072a32c57ebb06523abeaebd2db29dc08': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEBaligh Uddin2013-05-2749-0/+79
| |/ | | | | | | | | Change-Id: I6d43e9331dd993de57921360e33c36a58c355056 Auto-generated-cl: translation import
* | Cleaning up ImageShow.Ruben Brunk2013-05-292-59/+49
| | | | | | | | | | Bug: 9170644 Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
* | Add UI for insertion in FilmStripView.Angus Kong2013-05-281-0/+1
| | | | | | | | Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
* | Merge "functionality added to transport filter parameter values to following ↵Christian Wichner2013-05-271-0/+24
|\ \ | | | | | | | | | filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame." into gb-ub-photos-carlsbad
| * | functionality added to transport filter parameter values to following ↵Christian Wichner2013-05-241-0/+24
| | | | | | | | | | | | | | | | | | filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame. Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3
* | | am 461e101f: Add 13MP resolutionMichael Kolb2013-05-242-0/+4
|\ \ \ | |/ / |/| / | |/ | | * commit '461e101fb99df1a704544efb29e56ece25788985': Add 13MP resolution
| * Add 13MP resolutionMichael Kolb2013-05-242-0/+4
| | | | | | | | | | | | Bug: 9059351 Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
* | Merge "Make preview size smaller so that low-res images come in faster." ↵George Mount2013-05-211-1/+1
|\ \ | | | | | | | | | into gb-ub-photos-carlsbad
| * | Make preview size smaller so that low-res images come in faster.George Mount2013-05-211-1/+1
| | | | | | | | | | | | Change-Id: I82fea176a2aa8b0a3abfd829c0ec2d16f267ef5b
* | | am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-05-170-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | gb-ub-photos-bryce * commit '082541a730e56092b948580a8e8040be78979e23': Import translations. DO NOT MERGE
| * | 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
| | | | | | | | | | | | | | | | | | | | Change-Id: I5a5fee30a1f76b360c7ffca2ffec7592a66d7e52 Auto-generated-cl: translation import
* | | | am 1a266f16: Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '1a266f16edbef7cb0a770d37fcad958fc55a5862': Highlight selected option in FX and Borders
| * | | Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
| |/ / | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
* | | Merge "Add new camera activity back and fix build errors" into ↵Doris Liu2013-05-165-0/+502
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-carlsbad
| * | Add new camera activity back and fix build errorsDoris Liu2013-05-165-0/+502
| | | | | | | | | | | | Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
* | | am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into ↵Michael Kolb2013-05-168-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | gb-ub-photos-bryce * commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca': Add new overlay icons for sharpen and curves
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b
* | | | am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-162-2/+4
|\| | | | | | | | | | | | | | | | | | | * commit '75084da1b34e0ff9f269b5409d206c213532edbc': toUpper() some strings
| * | | Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-162-2/+4
| |\ \ \
| | * | | toUpper() some stringsJohn Reck2013-05-162-2/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
* | | / am fef58a0f: change edit iconJohn Hoford2013-05-164-1/+1
|\| | | | |_|/ |/| | | | | | | | * commit 'fef58a0fc969cc09b02cb9945da8d553698681e3': change edit icon
| * | change edit iconJohn Hoford2013-05-164-1/+1
| |/ | | | | | | | | bug:8988179 Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0
* | am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
|\| | | | | | | | | * commit '25d69c11831fabf8f4e474aaf17b05dd001979ce': New count down beeps.
| * Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
| |\