summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
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-072-13/+98
|\ \
| * | Add GCam progress indicator.Sascha Haeberling2013-11-072-13/+98
| |/ | | | | | | | | | | 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 "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
* | 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
* | Preserve high resolution image on touch during zoomDoris Liu2013-11-041-8/+11
|/ | | | | Bug: 11477449 Change-Id: I08b33cee258de1f90e5fa60e6483834dd5197bd2
* Check for media service being present before capture.Sascha Haeberling2013-11-041-0/+1
| | | | | | Bug: 11508325 Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
* 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-302-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-286-26/+334
|\ \ \
| * | | gcam: Add placeholder image.Ruben Brunk2013-10-286-26/+334
| | | | | | | | | | | | | | | | | | | | | | | | 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 "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
* | The initial focus value should be true.ztenghui2013-10-211-1/+1
| | | | | | | | | | | | | | | | Every time when we enter the wide angel (SRI) module, the preview should be in focus. bug:11234723 Change-Id: I218573946609f1e0e4415621a71b96a20775237d
* | Don't call onCurrentDataChanged for CameraPreview when reloading.ztenghui2013-10-211-3/+14
|/ | | | | | | | In this case, camera preview didn't change, so there is no need to call onCurrentDataChanged. bug:11237255 Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282
* Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbadDoris Liu2013-10-193-2/+16
|\
| * Fix SRI orientation on mantaDoris Liu2013-10-183-2/+16
| | | | | | | | | | Bug: 11292213 Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
* | Don't crash when preview surface could not be set.Sascha Haeberling2013-10-171-1/+1
|/ | | | | | Bug: 11021188 Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
* Merge "Show a preview cover until real preview is ready" into ↵Doris Liu2013-10-176-1/+26
|\ | | | | | | gb-ub-photos-carlsbad
| * Show a preview cover until real preview is readyDoris Liu2013-10-156-3/+26
| | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
* | Merge "Don't allow swipe into the film strip view when swipe is disabled" ↵ztenghui2013-10-171-1/+8
|\ \ | | | | | | | | | into gb-ub-photos-carlsbad
| * | Don't allow swipe into the film strip view when swipe is disabledztenghui2013-10-151-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The swipe is supposed to be intercepted by FilmStripView, however, when the children is not handling the scroll / fling gestures, FilmStripView will still has to handle it. In this case, we need to detect whether or not the swipe has been disabled. bug:11234333 bug:11221594 Change-Id: I1d0fbac65050aef225fb880a41df735e98bf48db
* | | Merge "Send an message to decouple the gcam module change." into ↵ztenghui2013-10-161-1/+6
|\ \ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | Send an message to decouple the gcam module change.ztenghui2013-10-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this particular case, we try to enter GCam module directly which cause the mCameraDevice to become null for photo module. Therefore we post a message to switch into GCam to make sure current mode switch complete first. bug:11252237 Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb
* | | | Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbadDoris Liu2013-10-163-23/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Fix shutter covering pie menuDoris Liu2013-10-163-23/+28
| | |/ | |/| | | | | | | | | | Bug: 11247988 Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 23:40:41 +0000