summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix another potential issue related to video capture intent." into gb-...ztenghui2013-10-091-3/+4
|\
| * Fix another potential issue related to video capture intent.ztenghui2013-10-091-3/+4
* | Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photo...Doris Liu2013-10-091-0/+1
|\ \
| * | Workaround to disable swiping for SRI during captureDoris Liu2013-10-091-0/+1
* | | Update bottom controls and action bar with a tighter bounds on data change.Erin Dahlgren2013-10-092-5/+10
* | | Merge "Fix NPE in video intent." into gb-ub-photos-carlsbadztenghui2013-10-091-1/+6
|\ \ \ | | |/ | |/|
| * | Fix NPE in video intent.ztenghui2013-10-081-1/+6
* | | Merge "Make the transition animation identical." into gb-ub-photos-carlsbadAngus Kong2013-10-091-6/+27
|\ \ \
| * | | Make the transition animation identical.Angus Kong2013-10-091-6/+27
* | | | Enter fullscreen if all items are removed.Angus Kong2013-10-091-0/+5
* | | | Merge "Don't go into Gcam when it's capture intent." into gb-ub-photos-carlsbadAngus Kong2013-10-093-5/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't go into Gcam when it's capture intent.Angus Kong2013-10-083-5/+8
* | | | Allow scaling beyond 1:1 in zoom viewDoris Liu2013-10-082-5/+25
* | | | Merge "Do not allow navigation to filmstrip during video recording" into gb-u...Doris Liu2013-10-092-4/+9
|\ \ \ \
| * | | | Do not allow navigation to filmstrip during video recordingDoris Liu2013-10-082-4/+9
| |/ / /
* | | | Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbadMindy DelliCarpini2013-10-0852-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Update camera assets for de-blue effortMindy DelliCarpini2013-10-0452-0/+0
* | | | Add shutter click sound in SoundClips.Angus Kong2013-10-081-3/+8
| |/ / |/| |
* | | Merge "Increase character limit." into gb-ub-photos-carlsbadSascha Haeberling2013-10-081-4/+4
|\ \ \
| * | | Increase character limit.Sascha Haeberling2013-10-071-4/+4
* | | | Correct sample factor for rotated images in zoom viewDoris Liu2013-10-071-1/+11
|/ / /
* | | Merge "Keep the ImageData size info consistent with MediaStore and Exif" into...ztenghui2013-10-083-38/+28
|\ \ \ | | |/ | |/|
| * | Keep the ImageData size info consistent with MediaStore and Exifztenghui2013-10-073-38/+28
* | | Fix missing filtershow string. DO NOT MERGESascha Haeberling2013-10-0749-4608/+3
|/ /
* / Revert CL that added broadcast receivers for shutter control.Sascha Haeberling2013-10-061-30/+1
|/
* Don't show the option for Gcam when using front camera.ztenghui2013-10-041-2/+5
* Update the HDR+ assets.Sascha Haeberling2013-10-0420-0/+0
* Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-ph...Doris Liu2013-10-041-8/+10
|\
| * Prevent picture taking via volumn key in filmstrip modeDoris Liu2013-10-031-8/+10
* | Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-phot...Sascha Haeberling2013-10-031-0/+7
|\ \
| * | Sync Camera2 permissions to GoogleCamera permissions.Sascha Haeberling2013-10-021-0/+7
* | | Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbadErin Dahlgren2013-10-032-2/+1
|\ \ \
| * | | Make space for photosphere rendering textErin Dahlgren2013-10-032-2/+1
| |/ /
* | | Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbadSascha Haeberling2013-10-0333-50/+45
|\ \ \
| * | | Change icons and code from HQ to HDR+ mode.Sascha Haeberling2013-10-0333-50/+45
* | | | Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbadAngus Kong2013-10-036-22/+227
|\ \ \ \
| * | | | Don't allow actions on items in progress.Angus Kong2013-10-036-22/+227
| |/ / /
* | | | Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-c...Doris Liu2013-10-032-3/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Leave ROI not set except in tap-to-focus scenarioDoris Liu2013-10-032-3/+6
| | |/ | |/|
* | | Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbadKevin Gabayan2013-10-035-0/+0
|\ \ \
| * | | Camera2 icon update for all resolutions.Kevin Gabayan2013-10-025-0/+0
* | | | Add HDR+ mode strings (to replace HQ mode)Sascha Haeberling2013-10-033-7/+5
* | | | Merge "Add missing crop message." into gb-ub-photos-carlsbadSascha Haeberling2013-10-031-1/+2
|\ \ \ \
| * | | | Add missing crop message.Sascha Haeberling2013-10-031-1/+2
* | | | | Merge "Only show delete action when in secure camera mode." into gb-ub-photos...ztenghui2013-10-031-0/+5
|\ \ \ \ \
| * | | | | Only show delete action when in secure camera mode.ztenghui2013-10-021-0/+5
| | |_|_|/ | |/| | |
* | | | | Merge "Show the delete button if there is room in action bar." into gb-ub-pho...ztenghui2013-10-031-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Show the delete button if there is room in action bar.ztenghui2013-10-021-1/+1
| |/ / /
* | | | Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-...Mangesh Ghiware2013-10-031-3/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Exit Camera on Up button if no APP_GALLERY handler found.Mangesh Ghiware2013-10-021-3/+9