summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/WideAnglePanoramaModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-161-1/+1
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* Revert "Camera: Mem-leak"Vijay kumar Tumati2014-06-191-1/+1
| | | | | | | | | | This reverts commit 46b761ab50e36daa2ff79527553014905e784895. We see some regressions with this change so we are reverting it for now. We will fix the issues soon. Change-Id: I59da92087006cef0da16c8a11fe7c31f32aa0312
* Camera: Mem-leakSuman Mukherjee2014-06-091-1/+1
| | | | | | | | | | | Hprof identified memleak in localdatalist from list and hashmap Reason: removedata was not getting invoked. Fix Made: Invoke removedata from ondestroy and onresume of camera activity Cleanup bitmaps before reallocation on same variable. CRs-Fixed: 655256 Change-Id: I42d99beb7e493eea2394462ee02cbe956e86c502
* Merge "Camera2: wait for previous saving picture done during panorama capture"Linux Build Service Account2014-04-211-1/+1
|\
| * Camera2: wait for previous saving picture done during panorama captureFei Zhang2014-04-101-1/+1
| | | | | | | | | | | | | | | | If saving pano picture thread is still running during onResume, we need to wait until it completes. CRs-fixed: 637244 Change-Id: I9ae5cb75a930421325d2e7d4d1b30306c867c6cf
* | Camera2: save the picture when rotate the deviceKerong Sui2014-03-311-1/+3
|/ | | | | | | | | If we rotate the device, the panoroma can not mosaic image, so if we rotate the device, we should stop capture immediately and save the previous capture frames. Change-Id: I4ba304957d4083b4ae58c084239d6dc3d7f4dc89 CRs-fixed: 627105
* Camera2: Inverted preview in PanoramaSuman Mukherjee2014-01-201-5/+3
| | | | | | | | | | | | For 8x26MTP device, panorama preview is coming as inverted. In present android version flippreview is itself taking care of rotation. This additional rotation is causing the inverted preview for the device where mount angle for sensor is more than 180degree. The logic related to mPanoAngle is not needed which had been added for previous android version. Change-Id: I6c5ed526382e0971e555a70946adb63a2acdf180 CRs-Fixed: 591767
* Set original camera parameters while switching between modules.Santhosh Kumar H E2013-12-111-7/+0
| | | | | | | | | | | | | | | | | Camera holder maintains a local variable to get original params and set those params back when user switch between modules. But these parameters were obtained from the instance of camera manager. So object in Camera holder will be a reference to an object in camera manager. Becasue of this all the parameters set in photo module are getting reflected in other modules. This change makes sure the camera holder's parameters object is created separately by getting data from camera device. Also reverted the alternative solution to reset scene mode in video and panorama module. CRs-Fixed: 579747 Change-Id: I02637fb2c215aeb1ba9076629400a339c31178ad
* Merge "Do not add screen hint dialog when window is not available."Linux Build Service Account2013-12-071-1/+6
|\
| * Do not add screen hint dialog when window is not available.Santhosh Kumar H E2013-11-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | SD card screen hint is directly added to activity window. In the error case its trying to add the screen hint dialog even before the activity window is available. This change check for the availability through window focus. In photo module update hint is called through handler to make sure it adds the dialog in UI thread, which was missing in panorama modo. This change as photomodule kind of UI updation calls in Panorama mode. Change-Id: I5cad2e86a23aceff290ef8d4ef89dbfdaaeb683d CRs-Fixed: 573549
* | Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-5/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| * Add logging to various actionsSeth Raphael2013-11-071-0/+4
| | | | | | | | | | | | Bug: 11514148 Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
| * gcam: Add placeholder image.Ruben Brunk2013-10-281-2/+3
| | | | | | | | | | | | Bug: 11050749 Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
| * Fix skipped hide review layout callsDoris Liu2013-10-251-1/+1
| | | | | | | | | | | | Bug: 11338381 Change-Id: I39c9541638f3e8c2a2f96ae4b1be7692a6db0e1c
| * 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
| * Fix SRI orientation on mantaDoris Liu2013-10-181-0/+7
| | | | | | | | | | Bug: 11292213 Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
| * Show a preview cover until real preview is readyDoris Liu2013-10-151-1/+1
| | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
* | Merge "Update preview as per aspect ratio on back key press."Linux Build Service Account2013-11-221-0/+4
|\ \
| * | Update preview as per aspect ratio on back key press.Santhosh Kumar H E2013-11-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user is not in full screen camera preview mode, pressing back key will take user to full screen preview mode. During this all views on filstrip are reloaded and shifted to full screen preview. While reloading preview aspect ratio was not considered so user could see stretch preview in case of front camera. This change calls resize of preview as per aspect ratio after reload. Change-Id: I3dc8db3cc9917f9db33f5101f6c39cf38b950264 CRs-Fixed: 568855
* | | Merge "Reset scene mode to Auto in camcoder and panorama modes."Linux Build Service Account2013-11-191-0/+7
|\ \ \
| * | | Reset scene mode to Auto in camcoder and panorama modes.Santhosh Kumar H E2013-11-121-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camcoder and panorama does not support scene modes. In the error case user has set scene mode to a value other than Auto in image camera mode. During initialization of video module camera parameters are obtained from AndroidCameraManagerImpl. Which maintains the local camera parameters object to avoid calling framework each time. The local parameter variable was set with a scene mode in image camera and hence it gets reflected in video module as well. This change will reset the scene mode to auto each time video or panorama modules are initialized. Change-Id: I3d620a9d163d4042cf8c09ed3c6ae8ee8ef2dc93 CRs-Fixed: 573573
* / / Panorama: Restart take picture call after layout changes.Santhosh Kumar H E2013-11-151-0/+15
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In reverse landscape and reverse portrait panorama modes, layout change callback is received when shutter key is pressed for the first time. It looks like the layout change call is because of navigation panel getting rendered on top of the screen. Due to this camera application resets the preview window dimensions and changes the status from capture to view finder. This change restart the start picture call after layout changes. Its done through hanlder because reset configMosaicPreview() posts a message to reset on a handler. Change-Id: Ic42a6929198eff52d659468f1df7170bdbdf6a38 CRs-Fixed: 573570
* | Camera: Add support for raw snapshotAlok Kediya2013-10-311-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously picture format only have option for jpeg and raw, but detailed raw image format is misssing from menu to choose. Also, changes to save raw image to coorect path are included. (cherrypicked from commit c0028f9dbe178c3fed1bcb4af96eb0db4d2e2973) Change-Id: Ifab7fd80e4a83370b2dc6932340005a06cc3552f (cherry picked from commit 27f9245f35d0284c17d8d2fdf5576ea3879e7d33) (cherry picked from commit 3c66703af119c06697f16303fadadbe956646cb3)
* | Camera: Fix panorama preview/snapshot rotation issueAlok Kediya2013-10-311-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove earlier hardcode and use unified solution to solve Panorama preview and snapshot rotation issue by using sensor mount angle and angle compensation in panorama postprocessing. (cherrypicked from commit a585a576a3259477a460e367fe4af69a448a2d25 ) Change-Id: Ie7130a0670174d5957b871b76b05a0bfdd9d4d27 (cherry picked from commit 21a26f3ffe023ee550a51a547e46c75c3dd914a6) (cherry picked from commit 50aebc4f3fbdf6f07a4b87cc87eef7e30257a05b) (cherry picked from commit e5fb76066ab7b5d1f82beb16a3fb8c4e5c031671)
* | Camera: fix panorama rotation issues.Alok Kediya2013-10-311-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | preview and snapshot are rotated unexpectedly. Need to change rotation angles in panorama based on sensor mount angle. (cherrypicked from commit e80845863aa453eb85cbf7f01af32b9c0c0b874a) Change-Id: I09d3111c3513141bffc649349a55d36a79818124 (cherry picked from commit 85ce7ba402fe354784505a8d6939700706e4401b) (cherry picked from commit be1768dfed2acedb34a3f393304999df3d4cabfb) (cherry picked from commit 790aeae0ed544e10ede5ccd7636eb4cf08a1d979)
* | The initial focus value should be true.ztenghui2013-10-221-1/+1
| | | | | | | | | | | | | | | | Every time when we enter the wide angel (SRI) module, the preview should be in focus. bug:11234723 Change-Id: I218573946609f1e0e4415621a71b96a20775237d
* | Fix SRI orientation on mantaDoris Liu2013-10-201-0/+7
|/ | | | | Bug: 11292213 Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
* Merge "Set camera controls visibility based on whether the camera preview is ↵Erin Dahlgren2013-10-141-6/+11
|\ | | | | | | centered." into gb-ub-photos-carlsbad
| * Set camera controls visibility based on whether the camera preview is centered.Erin Dahlgren2013-10-141-6/+11
| | | | | | | | | | Bug: 10861015 Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
* | Fix SRI upside down preview in reverse landscape and reverse portraitDoris Liu2013-10-141-2/+3
|/ | | | | | | | | Also make sure preview is not upside down after device flip, and fix camera controls jiggering during rotation Bug: 11216647 Bug: 11174540 Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
* Remove PopupManager to remove a memory leakSeth Raphael2013-09-261-3/+0
| | | | | | | | | PopupManager had been previously refactored out but vestiges remained. They were causing a memory leak of Activities in its hash map. Bug: 10728773 Change-Id: Ia6d98db1f0d30b4e879984033b471e8c802bc1c1
* Checks for low storage in wide-angle pano mode.Angus Kong2013-09-251-7/+18
| | | | | | | | | | 1. Storage.LOW_STORAGE_THRESHOLD -> Storage.LOW_STORAGE_THRESHOLD_BYTE. 2. Checks for low storage before start preview in wide-angle pano mode. 3. Add low storage warning message for debugging when in wide-angle pano mode. bug:10691367 Change-Id: Iffd96d322b33591c8f235fcf5680e86cf0f06571
* Show dialog when camera device is not connected.Angus Kong2013-09-171-11/+25
| | | | | | bug:10726516 Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
* Fix the flash mode transition in video modeztenghui2013-09-111-6/+2
| | | | | | | | | | onSwitchMode is wrongly overloaded, now is fixed. Basically, onCurrentDataChanged will handle the switching in and out of Camera. onDataFullScreenChange will handle full screen change on non-preview data. bug:10610967 Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
* Respect system auto-rotate setting.Angus Kong2013-09-051-0/+2
| | | | | | bug:10623244 Change-Id: I66757e50daf487680ac4f49d854c0f49d672b6ff
* Bring back wide angle panorama.Angus Kong2013-09-041-0/+1071
bug:10293937 Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05