Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Initialize GCam with GServices values. | Sascha Haeberling | 2013-10-09 | 4 | -12/+14 |
| | | | | | | Bug: 11103065 Change-Id: Ic8d3c9825abdc5d79c5e4c7b0e96770ab0941036 | ||||
* | Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad | Ruben Brunk | 2013-10-10 | 2 | -1/+35 |
|\ | |||||
| * | gcam: Add postcapture for gcam debugging. | Ruben Brunk | 2013-10-09 | 2 | -1/+35 |
| | | | | | | | | | | Bug: 11010544 Change-Id: I782bf3bd52f7b37cf47291501560ba771951760a | ||||
* | | Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad | Ruben Brunk | 2013-10-10 | 1 | -14/+30 |
|\ \ | |||||
| * | | gcam: Fix preview FOV. | Ruben Brunk | 2013-10-09 | 1 | -14/+30 |
| |/ | | | | | | | | | Bug: 11150965 Change-Id: Iacdcc7ad37193f5343d2c5d5de3fabecee1f05df | ||||
* | | Merge "Update bottom edit control for photos inside secure and insecure ↵ | Erin Dahlgren | 2013-10-09 | 1 | -2/+4 |
|\ \ | | | | | | | | | | mode." into gb-ub-photos-carlsbad | ||||
| * | | Update bottom edit control for photos inside secure and insecure mode. | Erin Dahlgren | 2013-10-09 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | Bug: 11067201 Change-Id: I21a775d46c26206e340c830fceafaf52e7a06ac5 | ||||
* | | | Merge "Fix another potential issue related to video capture intent." into ↵ | ztenghui | 2013-10-09 | 1 | -3/+4 |
|\ \ \ | |/ / |/| | | | | | gb-ub-photos-carlsbad | ||||
| * | | Fix another potential issue related to video capture intent. | ztenghui | 2013-10-09 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to delete the Uri sent from the intent. When we are in review mode, the mCurrentVideoUri should be from the capture result. bug:11136978 Change-Id: I148135326e3516936f7d6463941c6b50dbc389db | ||||
* | | | Merge "Workaround to disable swiping for SRI during capture" into ↵ | Doris Liu | 2013-10-09 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | gb-ub-photos-carlsbad | ||||
| * | | | Workaround to disable swiping for SRI during capture | Doris Liu | 2013-10-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Bug: 11139101 Change-Id: I2cfc9fb94259755e3db6f5d0b80287388cb846de | ||||
* | | | | Update bottom controls and action bar with a tighter bounds on data change. | Erin Dahlgren | 2013-10-09 | 2 | -5/+10 |
| |_|/ |/| | | | | | | | | | | | Bug: 11087361 Change-Id: Ie319d1767eb671ca7ed4a129aa9b75c77d63b20d | ||||
* | | | Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad | ztenghui | 2013-10-09 | 1 | -1/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix NPE in video intent. | ztenghui | 2013-10-08 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | bug:11136978 Change-Id: I6076581131e3dcdc456d8ac8865a5cc6f84e9da4 | ||||
* | | | Merge "Make the transition animation identical." into gb-ub-photos-carlsbad | Angus Kong | 2013-10-09 | 1 | -6/+27 |
|\ \ \ | |||||
| * | | | Make the transition animation identical. | Angus Kong | 2013-10-09 | 1 | -6/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The animation of transition between camera preview and filmstrip should be a special case to prevent jank. bug:11011577 Change-Id: If611599203e845d098cd6e4acb56d5631d085ffe | ||||
* | | | | Enter fullscreen if all items are removed. | Angus Kong | 2013-10-09 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | bug:11066937 Change-Id: Ibf9b03adc0d00838ba23c65361aa7c783c835d90 | ||||
* | | | | Merge "Don't go into Gcam when it's capture intent." into gb-ub-photos-carlsbad | Angus Kong | 2013-10-09 | 3 | -5/+8 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Don't go into Gcam when it's capture intent. | Angus Kong | 2013-10-08 | 3 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | bug:11115082 Change-Id: I2532e9597f526eb7daea9753b019d5ed95f5fe6b | ||||
* | | | | Allow scaling beyond 1:1 in zoom view | Doris Liu | 2013-10-08 | 2 | -5/+25 |
| | | | | | | | | | | | | | | | | | | | | Bug: 10950226 Change-Id: I38828edaf4010170f6c6db18b8c5fdeef91b4f11 | ||||
* | | | | Merge "Do not allow navigation to filmstrip during video recording" into ↵ | Doris Liu | 2013-10-09 | 2 | -4/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad | ||||
| * | | | | Do not allow navigation to filmstrip during video recording | Doris Liu | 2013-10-08 | 2 | -4/+9 |
| |/ / / | | | | | | | | | | | | | | | | | Bug: 11064867 Change-Id: I168136a193008578b3ad2642cba764650bcc2487 | ||||
* | | | | Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad | Mindy DelliCarpini | 2013-10-08 | 52 | -0/+0 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Update camera assets for de-blue effort | Mindy DelliCarpini | 2013-10-04 | 52 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes b/11007065 Shutter button disappears / becomes white when pressed Change-Id: I4001df821e545317eb4436da21f8f8d255d330f3 | ||||
* | | | | Add shutter click sound in SoundClips. | Angus Kong | 2013-10-08 | 1 | -3/+8 |
| |/ / |/| | | | | | | | | | | | | | | bug:11135055 Change-Id: Ib4396ada73021beff9845c49fee7c5eb8f4cc96d | ||||
* | | | Merge "Increase character limit." into gb-ub-photos-carlsbad | Sascha Haeberling | 2013-10-08 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | Increase character limit. | Sascha Haeberling | 2013-10-07 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10999205 Bug: 10558260 Bug: 10554875 Change-Id: Ib2add1a1b32a4a1a677d30a4bd11b0de5f6f126b | ||||
* | | | | Correct sample factor for rotated images in zoom view | Doris Liu | 2013-10-07 | 1 | -1/+11 |
|/ / / | | | | | | | | | | | | | Bug: 11067085 Change-Id: I52093052393fb1b2db08f105b8a16b68c3d3c95a | ||||
* | | | Merge "Keep the ImageData size info consistent with MediaStore and Exif" ↵ | ztenghui | 2013-10-08 | 3 | -38/+28 |
|\ \ \ | | |/ | |/| | | | | into gb-ub-photos-carlsbad | ||||
| * | | Keep the ImageData size info consistent with MediaStore and Exif | ztenghui | 2013-10-07 | 3 | -38/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Basically, the width and hight in the ImageData will be pre-rotation. bug:11067085 Change-Id: I377caf2f1d49d26b4d6823d4e72168a055d80858 | ||||
* | | | Fix missing filtershow string. DO NOT MERGE | Sascha Haeberling | 2013-10-07 | 49 | -4608/+3 |
|/ / | | | | | | | | | | | Bug: 11116778 Change-Id: I459e0b1db241a38866a3b06be5b316dc3b300c56 | ||||
* / | Revert CL that added broadcast receivers for shutter control. | Sascha Haeberling | 2013-10-06 | 1 | -30/+1 |
|/ | | | | | | | | | | Bug: 11006189 This was added for Gem support but causes us trouble. As it's not essential, we'll remove it now. Original CL was http://ag/342589 Change-Id: I9e137411cf5beb0fbdad611ee85803960feef14a | ||||
* | Don't show the option for Gcam when using front camera. | ztenghui | 2013-10-04 | 1 | -2/+5 |
| | | | | | | bug:11051221 Change-Id: I802eb0bc73adb3c573a2bf62b312bc681152223d | ||||
* | Update the HDR+ assets. | Sascha Haeberling | 2013-10-04 | 20 | -0/+0 |
| | | | | | | Bug: 11047147 Change-Id: I680d9a822876655d3c30715a9315a17b8db87763 | ||||
* | Merge "Prevent picture taking via volumn key in filmstrip mode" into ↵ | Doris Liu | 2013-10-04 | 1 | -8/+10 |
|\ | | | | | | | gb-ub-photos-carlsbad | ||||
| * | Prevent picture taking via volumn key in filmstrip mode | Doris Liu | 2013-10-03 | 1 | -8/+10 |
| | | | | | | | | | | Bug: 11045068 Change-Id: Ic823e04520fef3c2cef5341dceb9887fd62a5212 | ||||
* | | Merge "Sync Camera2 permissions to GoogleCamera permissions." into ↵ | Sascha Haeberling | 2013-10-03 | 1 | -0/+7 |
|\ \ | | | | | | | | | | gb-ub-photos-carlsbad | ||||
| * | | Sync Camera2 permissions to GoogleCamera permissions. | Sascha Haeberling | 2013-10-02 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10951073 Excluding the Gallery3d and gservices permissions. Change-Id: If6508114a47e1a793a2b4caab81437242907f8d2 | ||||
* | | | Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad | Erin Dahlgren | 2013-10-03 | 2 | -2/+1 |
|\ \ \ | |||||
| * | | | Make space for photosphere rendering text | Erin Dahlgren | 2013-10-03 | 2 | -2/+1 |
| |/ / | | | | | | | | | | | | | Bug: 11005014 Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb | ||||
* | | | Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad | Sascha Haeberling | 2013-10-03 | 33 | -50/+45 |
|\ \ \ | |||||
| * | | | Change icons and code from HQ to HDR+ mode. | Sascha Haeberling | 2013-10-03 | 33 | -50/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11047147 Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23 | ||||
* | | | | Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbad | Angus Kong | 2013-10-03 | 6 | -22/+227 |
|\ \ \ \ | |||||
| * | | | | Don't allow actions on items in progress. | Angus Kong | 2013-10-03 | 6 | -22/+227 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | bug:11049529 Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd | ||||
* | | | | Merge "Leave ROI not set except in tap-to-focus scenario" into ↵ | Doris Liu | 2013-10-03 | 2 | -3/+6 |
|\ \ \ \ | |/ / / |/| | | | | | | | gb-ub-photos-carlsbad | ||||
| * | | | Leave ROI not set except in tap-to-focus scenario | Doris Liu | 2013-10-03 | 2 | -3/+6 |
| | |/ | |/| | | | | | | | | | | Bug: 11005574 Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9 | ||||
* | | | Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad | Kevin Gabayan | 2013-10-03 | 5 | -0/+0 |
|\ \ \ | |||||
| * | | | Camera2 icon update for all resolutions. | Kevin Gabayan | 2013-10-02 | 5 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | Bug: 11048341 Change-Id: I71bf09eed24aa23e30eaf8c9bf4add8c0d1835b1 | ||||
* | | | | Add HDR+ mode strings (to replace HQ mode) | Sascha Haeberling | 2013-10-03 | 3 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11047147 Change-Id: Iadf72105d526467a1d8f63db839237a4cfba24e1 | ||||
* | | | | Merge "Add missing crop message." into gb-ub-photos-carlsbad | Sascha Haeberling | 2013-10-03 | 1 | -1/+2 |
|\ \ \ \ |