summaryrefslogtreecommitdiff
path: root/src/com/android/camera/PhotoModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* SnapdragonCamera: Fix the issue SoundPoolThread is not releasedJay Wang2015-11-131-3/+11
| | | | | | | | | | | | | | Two SoundPool objects are created during onCreate. However, the SoundPool is not released or re-used, properly and app continuously creating the new one. Fixing the issue for shutter button SoundPool by adding the releasing call and changing the call flow so it gets created and released during onPause and onResume. For count down SoundPool, we just re-use the existing SoundPool object instead of creating the new one. CRs-Fixed: 939366 Change-Id: I8ff1d62ce7b0e217df29ded92c9a07b02bf0ffbb
* Revert "SnapdragonCamera: fix screen flash on resuming"Byunghun Jeon2015-10-291-7/+1
| | | | | | This reverts commit 37856d6b3bcede0eb514e83d168d24b5f66d21c5. Change-Id: Ie16e324fb66b07deedf74dc2d3abefea607d92a0
* SnapdragonCamera: Fix crash issue with enable FD with TruePortraitByunghun Jeon2015-10-291-2/+13
| | | | | | | Fixes ui operation on background thread issue with always enabling FD with TruePortrait on. Change-Id: I976d206c2114aba1e1c5ae4b53959093c2836942
* Merge "SnapdragonCamera: Adding support for any number of cameras in app."Linux Build Service Account2015-09-301-24/+34
|\
| * SnapdragonCamera: Adding support for any number of cameras in app.Sanjeev Garg2015-09-161-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | At present the SnapdragonCamera App can support maximum of 2 cameras. Generalizing SnapdragonCamera App to support any number of cameras exposed to the application. Note - If number of cameras supported is greater than 2 then we need to add corresponding entries in media_profiles.xml so that recording can work fine on more than 2 cameras supported. Change-Id: Ic20667e29e0541d71c764bfd51a9c7a4d2ea83cd
* | Merge "SnapdragonCamera: fix a thumbnail update issue"Linux Build Service Account2015-09-291-0/+1
|\ \
| * | SnapdragonCamera: fix a thumbnail update issueLikai Ding2015-09-211-0/+1
| |/ | | | | | | | | | | | | | | After longshot, mLastJpegData is shown but never cleared. In next shot if focusing succeeds but no picture taken, the data is shown as thumbnail. Change-Id: I1f3865bc2db1e600494398d281791f25444dabf8 CRs-Fixed: 890598
* | Merge "SnapdragonCamera:Remove the "Enable Advance Capture" text from camera"Linux Build Service Account2015-09-291-1/+0
|\ \
| * | SnapdragonCamera:Remove the "Enable Advance Capture" text from cameralikaid2015-09-241-1/+0
| |/ | | | | | | | | | | | | | | | | | | | | Remove the text when the user sets "Chroma Flash" to "On". It says "Enable Advance Capture will disable Continuous Shot". This is confusing and should be removed. When user sets "Chroma Flash" to "On", ui don't show toast info. Change-Id: I3e04d924b8a533d9eb9303743453073162959afe CRs-Fixed: 905008
* | Merge "SnapdragonCamera: Do not show focus when click invalid area."Linux Build Service Account2015-09-281-0/+1
|\ \
| * | SnapdragonCamera: Do not show focus when click invalid area.likaid2015-09-111-0/+1
| |/ | | | | | | | | | | | | | | | | | | There is no area limit for click which cause the focus is responsed when click the invalid area. Add a judgement to avoid responding to invalid area. Change-Id: I9229afe81d7f540136a706e89aac71346c370834 CRs-Fixed: 903140
* / SnapdragonCamera: Hide all camera setting when countdown timer startslikaid2015-09-141-0/+1
|/ | | | | | | | | | | | Camera setting including module switcher scene mode filter mode and front/back camera switcher should not be used during countdown timer, since it may cause unexpected concurrent errors. Hide all the camera settings when countdown timer starts, show them again after countdown. Change-Id: I79c2add63c61d304fe0948e1c9fefe3a8c1a6fee CRs-Fixed: 900086
* Merge "SnapdragonCamera: Always enable FD with TruePortrait on"Linux Build Service Account2015-09-101-16/+34
|\
| * SnapdragonCamera: Always enable FD with TruePortrait onJay Wang2015-09-031-16/+34
| | | | | | | | | | | | | | | | Face detection should always be on when TruePortrait is enabled. Menu item for FD will show on and disabled (not toggleable) when TruePortrait is on. Change-Id: Ibbe8b5aaede2590d2587e9f8094d84f8717a037a
* | Merge "SnapdragonCamera: limit longshot captures"Linux Build Service Account2015-09-101-0/+13
|\ \
| * | SnapdragonCamera: limit longshot capturesJay Wang2015-09-031-0/+13
| |/ | | | | | | | | | | | | | | Limit the number of shots captured during longshot/continuous capture mode. The limit will be based on sysprop: "persist.camera.longshot.shotnum". Reset the value to 0 to remove the limit. Change-Id: Ib8994d2e851fc95feab6b1a3817fc66c75836ccc
* | Merge "SnapdragonCamera: Fix not able to view other pictures when macro mode"Linux Build Service Account2015-09-091-0/+1
|\ \
| * | SnapdragonCamera: Fix not able to view other pictures when macro modelikaid2015-08-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Macro+ mode, it always started the refocus editor view when clicked the preview thumbnail, that caused user could not view other pictures. Reset the flag mLastPhotoTakenWithRefocus to false when onResume,start the refocus editor only one time after take a picture with macro+ mode. Change-Id: I07772772be0e6227b87c4f58c900a6c024cd2fdc CRs-Fixed: 896098
* | | Merge "SnapdragonCamera: Set color effect as none when turn HDR on"Linux Build Service Account2015-09-091-3/+11
|\ \ \
| * | | SnapdragonCamera: Set color effect as none when turn HDR onlikaid2015-08-251-3/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Some color effects has special tone, if do HDR for specific color effects like Negative, we'll get unreasonable pictures. Disable the color effect when HDR on and set it as none effect. Change-Id: I8dca19b081504abaa85728b6d67b85699a184abb CRs-Fixed: 894360
* | / SnapdragonCamera: Stop the longshot when the storage is fulllikaid2015-09-061-0/+4
| |/ |/| | | | | | | | | | | | | | | | | | | The remainingPhotos was decreeased by 1 for each shot, when it came to 0, the longshot process was not stopped. When the remaining photos are less than 20, show "<20" for the remainingPhotos; When the storage is full, Stop the longshot process. Change-Id: Ifb1fb38f668132e1058f8a937afa9fa0b5afb5a7 CRs-Fixed: 893008
* | SnapdragonCamera: Allow touch to focus when using opti-zoomByunghun Jeon2015-09-011-1/+4
|/ | | | | | | Allow touch to focus when using opti-zoom Change-Id: Id8f40a395626eea3973e6b728f1fa581acf64633 CRs-Fixed: 900256
* SnapdragonCamera: fix app freeze with HDR and Macro+Likai Ding2015-08-191-18/+16
| | | | | | | | | When scenemode is set to HDR and then Macro+, HDR is not turned off. This will cause media server crash and app freeze. Turn off HDR when Macro+ or Optizoom is enabled. Change-Id: I51d7df55bb2c0dffd94d1ddadababaad62e3fe27 CRs-Fixed: 879081
* Merge "SnapDragon: Changes to create UI object before openCamera."Linux Build Service Account2015-08-101-1/+1
|\
| * SnapDragon: Changes to create UI object before openCamera.Guruprasad Gaonkar2015-08-071-1/+1
| | | | | | | | | | | | | | OpenCamera is excecuted on a thread. This thread will access UI object which was not initialized. Change-Id: I1cb15036e0b54a38a1d9750856b1eef5aa9dda43
* | SnapdragonCamera: fix screen flash on resumingLikai Ding2015-08-061-1/+7
|/ | | | | | | | | Currently preview cover will be hidden shortly after preview started, but if the actual first frame comes late, the main screen will flash. Register a oneshot preview callback to hide preview cover. CRs-Fixed: 881290 Change-Id: I5d93e57f0b9aa338c6b34461d5e3ee31806b6706
* SnapdragonCamera: fix crash taking Macro+ from MMSLikai Ding2015-07-281-1/+4
| | | | | | | | For capture intent, preview stops as soon as first jpeg callback arrives, but Macro+ has 7 callbacks. Make preview stop after all jpeg callbacks. Change-Id: Id29cc745aa2030edb60bc15da10d9123fa95bfd0
* Merge "SnapdragonCamera: Fix the advanced features relative toast issue"Linux Build Service Account2015-07-151-2/+30
|\
| * SnapdragonCamera: Fix the advanced features relative toast issuelikaid2015-07-141-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | The toast "Enable Advanced Capture will disable Continuous Shot" was shown every time when update the camera parameters, that made user confused. Move the toast to onSharedPreferenceChanged, show it only when turn on the advanced features. Change-Id: I34df735bb3928597093ba91a0ad10542014eeaae CRs-Fixed: 869438
* | SnapdragonCamera: fix NumberFormatException when input value invalidelikaid2015-07-151-6/+33
|/ | | | | | | | | | NumberFormatException occurred when converted the invalid input values, for example, user only input "." for some float values. Catch the NumberFormatException and show invalid input toast. Change-Id: Ie10b204950d43cca22a06532f04b9569fa545cbb CRs-Fixed: 862960
* SnapdragonCamera: Synchronize shutter button click.Sai Kumar Sanagavarapu2015-07-021-1/+1
| | | | | | | | | | | | | In monkey usecases, shutter button can be clicked really fast even before app's state is set properly. This can lead to multiple takepicture calls to lower layers. Since HAL maintains state machine and doesnt allow such operations, error will be thrown. To avoid such situations, make onShutterButtonClick() a synchronized method so that only one thread can access it at a time. Change-Id: I19a2de7574452083d75204c84b89dac95d8b4f3e
* SnapdragonCamera: To pass Auto HDR status using stringAbhishek Pant2015-06-011-1/+1
| | | | | | | Made changes to pass Auto HDR enable/disable status from Applicaiton to HAL using string instead of key Change-Id: I6e8d1b83e10b390f4d5a8eee113238797316e821
* SnapdragonCamera: implement optizoom and chromaflash UILikai Ding2015-05-271-1/+16
| | | | | | add scene mode for optizoom and preference entry for chromaflash Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf
* Merge "SnapdragonCamera: add touch animation for refocus"Linux Build Service Account2015-05-241-0/+1
|\
| * SnapdragonCamera: add touch animation for refocusLikai Ding2015-04-271-0/+1
| | | | | | | | | | | | also added a dialog to explain refocus mode Change-Id: I8c319c2cb64ca85d320eca453ade9c325fd4ac37
* | Merge "SnapdragonCamera: Fix app crash when taking longshot during countdown"Linux Build Service Account2015-05-161-0/+4
|\ \
| * | SnapdragonCamera: Fix app crash when taking longshot during countdownlikaid2015-04-211-0/+4
| |/ | | | | | | | | | | | | Cancel countdown capture when long press shutter button for longshot. Change-Id: Ie33aba13139b0476085eb1f5256459f289d8af86 CRs-Fixed: 823502
* | Merge "SnapdragonCamera: Fix app auto close when repeat plug in/out USB cable"Linux Build Service Account2015-05-161-21/+1
|\ \
| * | SnapdragonCamera: Fix app auto close when repeat plug in/out USB cablelikaid2015-04-171-21/+1
| |/ | | | | | | | | | | | | | | | | | | When the system try to unmount SDcard, it will kill the process which hold the instance of media provider. When camera is in idle state, do not keep the media provider instance. Change-Id: Ie1edf2397544e613435f0930dba73da9660616cd CRs-Fixed: 823334
* | Merge "SnapdragonCamera: longshot memory check fix"Linux Build Service Account2015-05-121-18/+20
|\ \
| * | SnapdragonCamera: longshot memory check fixLikai Ding2015-04-131-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | getCachedSize() has been changed recently resulting in an increased failure rate. Restore old behavior in longshot memory check. Also, remove some class members to save a little memory. Change-Id: Ib5c22201be04387ffecb4052a8bbc92b2e924deb
* | | Merge "SnapdragonCamera: Fix camera parameters concurrent modification."Linux Build Service Account2015-05-051-23/+36
|\ \ \
| * | | SnapdragonCamera: Fix camera parameters concurrent modification.Sai Kumar Sanagavarapu2015-04-161-23/+36
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Parameters if updated from different threads will lead to concurrent modification exception in frameworks. To avoid this, use synchronize block whereever the parameters are being updated. Change-Id: I51dd27e1b4836ddef910224331551806ff66b24d
* / | SnapdragonCamera: Fix preview window race condition.Sai Kumar Sanagavarapu2015-04-161-13/+16
|/ / | | | | | | | | | | | | | | | | | | | | There could be race condition between onPreviewUIReady() and start preview thread leading to final null preview window being set to camera device even though a valid surface is available at the time of start preview. Fix this by synchronizing these two threads. Change-Id: I07654ee3c5d1c71530ef5b588f30d22c65f04e61
* | Merge "SnapdragonCamera: fix camera FC when internal storage isn't enough"Linux Build Service Account2015-04-151-1/+7
|\ \
| * | SnapdragonCamera: fix camera FC when internal storage isn't enoughlikaid2015-04-081-1/+7
| |/ | | | | | | | | | | | | | | | | The menu may be not initialized when switch save path in PhotoModule. Check the menu initialized state before switch save path. Change-Id: Ibdc8d5510924b45f5abfc13f4d70dcf9620c8b7d CRs-Fixed: 801619
* | Merge "SnapdragonCamera: customize camera picture quality"Linux Build Service Account2015-04-151-1/+1
|\ \ | |/ |/|
| * SnapdragonCamera: customize camera picture qualitylikaid2015-04-081-1/+1
| | | | | | | | | | | | | | regional feature Change-Id: I4c80b4970ff4f628080cad20980aa545add6fdcf CRs-Fixed: 815630
* | Merge "SnapdragonCamera: fix crash during module switch"Linux Build Service Account2015-04-081-4/+3
|\ \ | |/ |/|
| * SnapdragonCamera: fix crash during module switchLikai Ding2015-04-031-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When module is switched from camcorder to camera, on UI thread, it calls setFlipValue and then setParameters in onOrientationChanged. Meanwhile, background OpenCameraThread is modifying mParameters in startPreview(). This leads to a ConcurrentModificationException. Check camera state in onOrientationChanged. If it's not IDLE, skip setFlipValue and setParameter since these will be done in startPreview. This change also fixes camera UI orientation during a landscape launch. Change-Id: I15ed1e2bbbfc95f1b53b7309b72942d98350c564 CRs-Fixed: 815034