Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Finish the secure camera activity when user try to play a video." ↵ | ztenghui | 2013-10-12 | 1 | -5/+13 |
|\ | | | | | | | into gb-ub-photos-carlsbad | ||||
| * | Finish the secure camera activity when user try to play a video. | ztenghui | 2013-10-11 | 1 | -5/+13 |
| | | | | | | | | | | | | bug:11190995 Change-Id: I8aa1a538496c291d34ca25d489a7eb03f0c90b53 | ||||
* | | Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad | Doris Liu | 2013-10-12 | 1 | -11/+5 |
|\ \ | |/ |/| | |||||
| * | Bring full screen window flag back to camera | Doris Liu | 2013-10-11 | 1 | -11/+5 |
| | | | | | | | | | | Bug: 11027091 Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362 | ||||
* | | restore Usage Statistics | Seth Raphael | 2013-10-11 | 1 | -0/+2 |
|/ | | | | | | | initialize was not being called anywhere. Bug: 11188914 Change-Id: I9b3ae094b2d22605c368c1ac38de80090a336894 | ||||
* | Merge "gcam: Allow debugging postcapture image to be added to mediastore." ↵ | Ruben Brunk | 2013-10-11 | 1 | -4/+15 |
|\ | | | | | | | into gb-ub-photos-carlsbad | ||||
| * | gcam: Allow debugging postcapture image to be added to mediastore. | Ruben Brunk | 2013-10-10 | 1 | -4/+15 |
| | | | | | | | | | | Bug: 11010544 Change-Id: Iaa5a2d8bcc3ece583376517e006018b0c8b75587 | ||||
* | | Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad | Angus Kong | 2013-10-11 | 1 | -4/+17 |
|\ \ | |||||
| * | | Avoid unnecessary bringChildToFront() calls. | Angus Kong | 2013-10-11 | 1 | -4/+17 |
| | | | | | | | | | | | | | | | | | | bug:10750719 Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a | ||||
* | | | Don't show a details dialog if there are no details. | Sascha Haeberling | 2013-10-10 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | Bug: 11021907 Change-Id: Ie4919889f60f2035fbd6f8b99bff4415e2962ae6 | ||||
* | | | Merge "Don't initialize photo module if it's paused." into gb-ub-photos-carlsbad | Sascha Haeberling | 2013-10-11 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | Don't initialize photo module if it's paused. | Sascha Haeberling | 2013-10-10 | 1 | -3/+3 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11028614 The main visible issue with this is that we register additional location listeners, thus draining battery as we don't unregister them ever. Change-Id: Ibd39171681867a12bc00abe9705f4281b9945ec1 | ||||
* | | | Merge "Check both the requestId of current item and total items in filmstrip ↵ | Erin Dahlgren | 2013-10-11 | 1 | -7/+5 |
|\ \ \ | | | | | | | | | | | | | for bottom controls." into gb-ub-photos-carlsbad | ||||
| * | | | Check both the requestId of current item and total items in filmstrip for ↵ | Erin Dahlgren | 2013-10-10 | 1 | -7/+5 |
| | |/ | |/| | | | | | | | | | | | | | | | | bottom controls. Bug: 11169201 Change-Id: I9d42b168efe62712f76165db5221757a1f20013f | ||||
* | | | Add fling support in zoom view | Doris Liu | 2013-10-10 | 1 | -4/+120 |
| | | | | | | | | | | | | | | | | | | Bug: 10679704 Change-Id: I7ab72fdf4e836495b2471c65fd57f952e863f1dd | ||||
* | | | Merge "Remove display change listener for mode switch" into ↵ | Doris Liu | 2013-10-11 | 5 | -2/+24 |
|\ \ \ | |_|/ |/| | | | | | gb-ub-photos-carlsbad | ||||
| * | | Remove display change listener for mode switch | Doris Liu | 2013-10-10 | 5 | -2/+24 |
| | | | | | | | | | | | | | | | Bug: 10928549 Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670 | ||||
* | | | Merge "Hide the status bar and switch into lights-out mode when popup is ↵ | Sascha Haeberling | 2013-10-10 | 3 | -4/+19 |
|\ \ \ | |_|/ |/| | | | | | dimissed." into gb-ub-photos-carlsbad | ||||
| * | | Hide the status bar and switch into lights-out mode when popup is dimissed. | Sascha Haeberling | 2013-10-10 | 3 | -4/+19 |
| | | | | | | | | | | | | | | | | | | Bug: 11119286 Change-Id: I912103f36d27b07cd6fcebc2dae7c2964e883cc8 | ||||
* | | | Merge "Workaround for re-applying transform on new surface texuture" into ↵ | Doris Liu | 2013-10-10 | 1 | -7/+5 |
|\ \ \ | |_|/ |/| | | | | | gb-ub-photos-carlsbad | ||||
| * | | Workaround for re-applying transform on new surface texuture | Doris Liu | 2013-10-10 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | Bug: 10981460 Change-Id: Ic7fca757f3c1171317c76cd90fad43ff5c5ae5d2 | ||||
* | | | Merge "Fix flash issue" into gb-ub-photos-carlsbad | ztenghui | 2013-10-10 | 2 | -1/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix flash issue | ztenghui | 2013-10-09 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flash light should show up at the same time as the control show up. Also, when we change the flash mode, we should update the flash on screen indicator. bug:11064667 Change-Id: I888d3ce76ac618a4c7b40a288ecce13555c89ab0 | ||||
* | | | Initialize GCam with GServices values. | Sascha Haeberling | 2013-10-09 | 3 | -11/+11 |
| | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | 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 | ||||
* / / | Add shutter click sound in SoundClips. | Angus Kong | 2013-10-08 | 1 | -3/+8 |
|/ / | | | | | | | | | | | bug:11135055 Change-Id: Ib4396ada73021beff9845c49fee7c5eb8f4cc96d | ||||
* / | Correct sample factor for rotated images in zoom view | Doris Liu | 2013-10-07 | 1 | -1/+11 |
|/ | | | | | Bug: 11067085 Change-Id: I52093052393fb1b2db08f105b8a16b68c3d3c95a | ||||
* | 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 | ||||
* | 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 | ||||
* | 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 |