summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Ensure mOpenCameraThread has been setup before dereferencing." into ↵Ruben Brunk2013-11-081-7/+15
|\ | | | | | | gb-ub-photos-carlsbad
| * Ensure mOpenCameraThread has been setup before dereferencing.Ruben Brunk2013-11-071-7/+15
| | | | | | | | | | Bug: 11579062 Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b
* | Merge "Add GCam progress indicator." into gb-ub-photos-carlsbadSascha Haeberling2013-11-073-13/+100
|\ \
| * | Add GCam progress indicator.Sascha Haeberling2013-11-073-13/+100
| |/ | | | | | | | | | | Bug: 11505806 Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
* / hide preview cover on arrival of new preview data if hiddenAndy Huibers2013-11-073-4/+12
|/ | | | | Bug: 11433257 Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
* Merge "Fix photo mode is getting stuck in a single CameraState." into ↵Erin Dahlgren2013-11-071-6/+8
|\ | | | | | | gb-ub-photos-carlsbad
| * Fix photo mode is getting stuck in a single CameraState.Erin Dahlgren2013-11-071-6/+8
| | | | | | | | | | Bug: 11574716 Change-Id: Ieb3622103798077071bb9350773851b7acbff756
* | Show chooser on EDIT intents that have no activity for action.Erin Dahlgren2013-11-071-1/+6
|/ | | | | Bug: 11571947 Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b
* Merge "Parallelize opening the camera with view handling in photo mode." ↵Erin Dahlgren2013-11-072-80/+192
|\ | | | | | | into gb-ub-photos-carlsbad
| * Parallelize opening the camera with view handling in photo mode.Erin Dahlgren2013-11-072-80/+192
| | | | | | | | | | Bug: 11255097 Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
* | Merge "Decouple the visibility check for system UI from action bar" into ↵ztenghui2013-11-071-5/+10
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Decouple the visibility check for system UI from action barztenghui2013-11-061-5/+10
| | | | | | | | | | | | | | | | And make sure we toggle system UI when reload. bug:11539377 Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0
* | Don't crash Photo Sphere on back button press in filmstrip.Sascha Haeberling2013-11-061-2/+4
| | | | | | | | | | | | Bug: 11554580 Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56
* | Merge "Fix the RTL layout in the app's manifest." into gb-ub-photos-carlsbadztenghui2013-11-062-0/+3
|\|
| * Fix the RTL layout in the app's manifest.ztenghui2013-11-052-0/+3
| | | | | | | | | | | | | | At the same time, make sure the bottom controls are following RTL rules. bug:11481090 Change-Id: I52262aece7c16c194b6419150c1d4c13abff4f2d
* | Merge "Make image editor intent general." into gb-ub-photos-carlsbadErin Dahlgren2013-11-061-2/+1
|\ \
| * | Make image editor intent general.Erin Dahlgren2013-11-051-2/+1
| |/ | | | | | | | | Bug: 11372979 Change-Id: I7649eb995fbd78f9b29c76da777aca83777c49fc
* | add 'capturing' string for in process indicatorsAlan Newberger2013-11-051-0/+3
| | | | | | | | | | | | | | This string can be used for in progess screen indicators. Bug: 11505806 Change-Id: I3b0e3809b8389cfea2059b239d09a3e0766a77c6
* | Merge "camera: Ensure camera release for lockscreen transition." into ↵Ruben Brunk2013-11-061-1/+8
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | camera: Ensure camera release for lockscreen transition.Ruben Brunk2013-11-051-1/+8
| |/ | | | | | | | | Bug: 11063890 Change-Id: Iec7fb672571166ee5a560a8245b56affa627e88b
* | Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbadDoris Liu2013-11-061-4/+5
|\ \ | |/ |/|
| * Make sure preview aspect ratio is updatedDoris Liu2013-11-051-4/+5
| | | | | | | | | | Bug: 11509233 Change-Id: Ide6f5bbe0abe7ed45e56b3f34c19204c1294afc7
* | Merge "adjust keyguard camera layout to make buttons match" into ↵Alan Newberger2013-11-041-3/+3
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | adjust keyguard camera layout to make buttons matchAlan Newberger2013-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | by trial and error adjusted the bottom margins of the controls to make transition to real camera layout seamless on the HH and N4. Bug: 11236276 Change-Id: I707a5b0b94ac466c07b19c84473e444250cecf28
* | | Merge "Preserve high resolution image on touch during zoom" into ↵Doris Liu2013-11-041-8/+11
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-carlsbad
| * | Preserve high resolution image on touch during zoomDoris Liu2013-11-041-8/+11
| | | | | | | | | | | | | | | Bug: 11477449 Change-Id: I08b33cee258de1f90e5fa60e6483834dd5197bd2
* | | Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbadAlan Newberger2013-11-041-4/+4
|\ \ \ | |/ / |/| |
| * | Adjust HDR options menu detailsAlan Newberger2013-11-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | To better align HDR/HDR+ menu options with other menu options, shortening the description and making it all caps. Bug: 11481286 Change-Id: I05ddb3594d1680b11259f128cc1e4aa7954892f8
* | | Check for media service being present before capture.Sascha Haeberling2013-11-041-0/+1
| | | | | | | | | | | | | | | | | | Bug: 11508325 Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
* | | Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbadAlan Newberger2013-11-012-0/+12
|\ \ \
| * | | Add Samsung front camera resolutionsMichael Kolb2013-11-012-0/+12
| |/ / | | | | | | | | | | | | | | | | | | Bug: 11462711 Bug: 9275928 Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
* | | Add new notification icon.Sascha Haeberling2013-11-014-0/+0
| | | | | | | | | | | | | | | | | | Bug: 11417480 Change-Id: I072a1348d515b2cd435748e2db2824e98a604413
* | | Merge "gcam: Add generic preview fps range selection." into ↵Ruben Brunk2013-10-311-1/+4
|\ \ \ | |/ / |/| | | | | gb-ub-photos-carlsbad
| * | gcam: Add generic preview fps range selection.Ruben Brunk2013-10-291-1/+4
| | | | | | | | | | | | | | | Bug: 11433097 Change-Id: Ice0f7ad3cd0684183298ce03bab3038a41316cf6
* | | Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up iconAlan Newberger2013-10-304-22/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CameraUtil.launchGallery incorrectly describes a mechanism to call an APP_GALLERY category intent. Since we're using Gallery icon we should go direct to Gallery, which IntentHelper already does. Simply removed the util class and call the helper direct from the activity. Also noticed during testing that the SecureCamera was not correctly showing the Gallery icon, though its behavior would take user to Gallery. Finally, removing restriction that the video player intent should go to Gallery, instead it should route to system preferred intent. Bug: 11065256 Change-Id: I941f9469de169919c4bac6c91dde7e577921f737
* | | Fix rotation bug for animated thumbnail shown after capture.Andy Huibers2013-10-291-1/+1
|/ / | | | | | | | | | | Bug: 11420737 Change-Id: I55b90137b362d0b3b98aba34114537e0f6107b8c
* | Merge "Fix the mapping between preview UI and camera sensor" into ↵Doris Liu2013-10-295-18/+61
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Fix the mapping between preview UI and camera sensorDoris Liu2013-10-285-18/+61
| | | | | | | | | | | | | | | Bug: 11409659 Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
* | | Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbadztenghui2013-10-282-3/+9
|\ \ \
| * | | Fix crash when trying to reopen the camera.ztenghui2013-10-282-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case, another app is using the Camera, such that the camera.open will hit an exception. We should show an dialog here. bug:11258139 Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
* | | | Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbadRuben Brunk2013-10-287-26/+363
|\ \ \ \
| * | | | gcam: Add placeholder image.Ruben Brunk2013-10-287-26/+363
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11050749 Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
* | | | | Merge "Fix memory leak due to inner class for handler." into ↵ztenghui2013-10-281-1/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / gb-ub-photos-carlsbad
| * | | Fix memory leak due to inner class for handler.ztenghui2013-10-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To keep the existing interface, we just overwrite the handler here. bug:11336965 Change-Id: I77b2f577279244439ee9f81344f47bf5773e527b
* | | | Update aspect ratio when preview aspect ratio changesDoris Liu2013-10-272-0/+22
| |/ / |/| | | | | | | | | | | Bug: 11250125 Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067
* | | Fix skipped hide review layout callsDoris Liu2013-10-251-1/+1
|/ / | | | | | | | | | | Bug: 11338381 Change-Id: I39c9541638f3e8c2a2f96ae4b1be7692a6db0e1c
* | Merge "Bump version number for MR1" into gb-ub-photos-carlsbadSascha Haeberling2013-10-211-1/+5
|\ \
| * | Bump version number for MR1Sascha Haeberling2013-10-211-1/+5
| | | | | | | | | | | | | | | | | | Bug: 11240056 Change-Id: Ia3ad9f86516eed5ca60e8707d53139d54e3ee562
* | | Merge "Update preview controls on deleting all items." into ↵Erin Dahlgren2013-10-211-1/+5
|\ \ \ | |/ / |/| | | | | gb-ub-photos-carlsbad
| * | Update preview controls on deleting all items.Erin Dahlgren2013-10-211-1/+5
| | | | | | | | | | | | | | | Bug: 11219537 Change-Id: I897b65bd7c594b904aa29462e056a10d0e9c52a2