summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Refactor to separate out EGL part.Angus Kong2013-06-124-117/+260
* Mirror CL 319301 in Bryce.Ruben Brunk2013-06-111-20/+36
* Fix build.Angus Kong2013-06-111-1/+1
* Use setPreviewFpsRange instead.Angus Kong2013-06-113-5/+23
* Fix panel anim in ICSnicolasroard2013-06-101-1/+6
* Fix state panel text sizenicolasroard2013-06-101-0/+1
* Fix warningsnicolasroard2013-06-101-3/+3
* Merge "Add enable/disable swiping to filmstrip" into gb-ub-photos-carlsbadDoris Liu2013-06-077-11/+27
|\
| * Add enable/disable swiping to filmstripDoris Liu2013-06-067-11/+27
* | Fix NPE in PreparePageFadeoutTextureBobby Georgescu2013-06-071-0/+4
|/
* Merge "Play video from flim strip." into gb-ub-photos-carlsbadAngus Kong2013-06-055-26/+63
|\
| * Play video from flim strip.Angus Kong2013-06-045-26/+63
* | Merge "Add interface for swipe checking." into gb-ub-photos-carlsbadAngus Kong2013-06-053-0/+22
|\ \
| * | Add interface for swipe checking.Angus Kong2013-06-053-0/+22
* | | Merge "Fix graphical corruption due to tear down race" into gb-ub-photos-carl...John Reck2013-06-051-0/+3
|\ \ \ | |/ / |/| |
| * | Fix graphical corruption due to tear down raceJohn Reck2013-06-051-0/+3
* | | Merge "Removing unused UI fields in FilterRepresentation." into gb-ub-photos-...Ruben Brunk2013-06-0527-95/+31
|\ \ \ | |_|/ |/| |
| * | Removing unused UI fields in FilterRepresentation.Ruben Brunk2013-06-0527-95/+31
* | | Merge "Get new camera activity up to date" into gb-ub-photos-carlsbadDoris Liu2013-06-046-178/+122
|\ \ \
| * | | Get new camera activity up to dateDoris Liu2013-06-036-178/+122
* | | | Fix pie menu button disappearingDoris Liu2013-06-031-1/+1
* | | | Merge "Add secure camera support." into gb-ub-photos-carlsbadAngus Kong2013-06-043-42/+139
|\ \ \ \ | |_|/ / |/| | |
| * | | Add secure camera support.Angus Kong2013-06-033-42/+139
| | |/ | |/|
* | | Merge "Fixes save filename for panos after edit." into gb-ub-photos-carlsbadRuben Brunk2013-06-031-3/+36
|\ \ \
| * | | Fixes save filename for panos after edit.Ruben Brunk2013-06-031-3/+36
| |/ /
* / / Add play icon for videos.Angus Kong2013-06-031-6/+22
|/ /
* | am 8bb4e1a0: Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
|\ \ | |/ |/|
| * Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
* | Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbadztenghui2013-06-032-6/+9
|\ \
| * | Add LUT3D filter state savingztenghui2013-05-312-6/+9
* | | Merge "Add recent changes to new photo module" into gb-ub-photos-carlsbadDoris Liu2013-06-037-77/+73
|\ \ \
| * | | Add recent changes to new photo moduleDoris Liu2013-05-317-77/+73
* | | | Add newly taken photos/videos to film strip.Angus Kong2013-05-314-4/+61
|/ / /
* | | Merge "Adjust data id even if it's not currently used." into gb-ub-photos-car...Angus Kong2013-05-311-5/+11
|\ \ \
| * | | Adjust data id even if it's not currently used.Angus Kong2013-05-301-5/+11
* | | | Improve gesture handlingDoris Liu2013-05-319-237/+137
* | | | Merge "Translate the first/last view too." into gb-ub-photos-carlsbadAngus Kong2013-05-311-5/+9
|\ \ \ \
| * | | | Translate the first/last view too.Angus Kong2013-05-301-5/+9
| |/ / /
* | | | Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbadAngus Kong2013-05-311-1/+2
|\ \ \ \
| * | | | Don't use the same drawable for every view.Angus Kong2013-05-301-1/+2
| |/ / /
* | | | Merge "Fix mistakenly reversed order in FilmStripView." into gb-ub-photos-car...Angus Kong2013-05-311-2/+2
|\ \ \ \
| * | | | Fix mistakenly reversed order in FilmStripView.Angus Kong2013-05-301-2/+2
| |/ / /
* / / / 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-301-2/+23
|\ \ \ | | |/ | |/|
| * | Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-301-2/+23
| |\ \
| | * | Add HTC One picture resolutionsMichael Kolb2013-05-301-2/+23
* | | | am a1db2653: Dismiss settings when showing popup in Video mode.Angus Kong2013-05-301-0/+1
|\| | |
| * | | Dismiss settings when showing popup in Video mode.Angus Kong2013-05-291-0/+1
* | | | Copy Tiling changes from G+John Reck2013-05-305-187/+481
| |_|/ |/| |
* | | Cleaning up ImageShow.Ruben Brunk2013-05-297-217/+25