summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Turn off "Beep during countdown" doesn't workweijiew2016-12-141-1/+1
| | | | | | | | It uses SHUTTER_SOUND_KEY to control the sound. Change to right key KEY_TIMER_SOUND_EFFECTS CRs-Fixed: 1101206 Change-Id: Ib0a81ed85cbf4393d289137f9b04ed2bb66c91a5
* SnapdragonCamera: GPS location can't be turn On in camera settingsweijiew2016-11-241-4/+7
| | | | | | | | | In Camera2, SharedPreferences persistes GPS location value by key(pref_camera2_recordlocation_key), but gets GPS location value by key(pref_camera_recordlocation_key). CRs-Fixed: 1088262 Change-Id: I33ddeb8f20fed03449bded2760c0ad1b8e36c91c
* SnapdragonCamera: Do not call cancel auto focus on startupJay Wang2016-11-041-3/+3
| | | | | | | | Do not call cancel_auto_focus on first time launch as it is incorrectly signalling 3A that focus is finished. CRs-Fixed: 1083298 Change-Id: Iaaa981ba40e4844de3469a0526934c810f1b314a
* SnapdragonCamera: Camera1 Selfie Mirror orientation checkJack Yoo2016-10-131-5/+21
| | | | | | | Checking the case that front facing camera is 90 instead of 270. Change-Id: I75319db771057d64d1a21a1de825edd54af83982 CRs-Fixed: 1072060
* SnapdragonCamera: Use persist to set Camera1/Camera2 modeByunghun Jeon2016-09-271-0/+0
| | | | | | | | | Use persist flag to choose camera1 or camera2. Flag is persist.camera.camera2 Default will be camera1 Change-Id: Ic616b3d4b9f1293e45c7a006587f5c9ba34a0687 CRs-Fixed: 1066444
* SnapdragonCamera: Fix ANR during open cameraqimengp2016-09-271-1/+0
| | | | | | | | | | | When preview UI destory, app call Camera API as order: setPreviewDispaly(null) and stopPreview(). In case native window disconnected before stopPreview(), will cause ANR, since calling to native window fails. Native window is taken care within camera framework. So, by removing setPreviewDisplay(null), can avoid this issue. Change-Id: Id804f2e0876a61d974e58dd996c46fe769f69856
* Merge "SnapdragonCamera:Fix can't take picture" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-09-211-0/+6
|\
| * SnapdragonCamera:Fix can't take picturejunjiez2016-09-071-0/+6
| | | | | | | | | | | | | | | | | | | | When the sensor gets turn off in settings, launching camera will be slower and cause mPreviewRect not set. Set mPreviewRect again by invoking setPreviewSize when camera is opened. Change-Id: I7923320ab4a54ae2194f84b40f60a33b581d5eae CRs-Fixed: 1062228
* | Merge "SnapdragonCamera:Fix RuntimeException in monkey test" into ↵Camera Software Integration2016-09-211-0/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera:Fix RuntimeException in monkey testjunjiez2016-09-051-0/+1
| |/ | | | | | | | | | | | | | | | | When preview is stoped, taking picture will cause RuntimeException Add a judgement in method capture to avoid taking picture after stop preview. Change-Id: Ib03b3c2392c32b9314282196fd918787e7582b20 CRs-Fixed: 1063230
* | Merge "SnapdragonCamera:Fix NullPointerException in monkey test" into ↵Camera Software Integration2016-09-141-0/+4
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera:Fix NullPointerException in monkey testjunjiez2016-08-301-0/+4
| |/ | | | | | | | | | | | | | | | | | | When R.layout.ts_makeup_item_view is pressed onMakeupLevel will be called,but at this time the OpenCameraThread maybe has not opened the camera, so the NullPointerException occurred,add a judgement to avoid camera to be null. Change-Id: Ia9a9e579a4e400e05deeeb2c36539a0ff95d3918 CRs-Fixed: 1060870
* | Merge "SnapdragonCamera: Changing ubifocus shutter sound" into ↵Linux Build Service Account2016-09-071-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Changing ubifocus shutter soundJack Yoo2016-08-291-1/+1
| |/ | | | | | | | | | | | | | | Changing ubifocus shutter sound based on shutter sound menu setting value. Change-Id: Ie02bb158517ced87285bcea445984bd344142a8c CRs-Fixed: 1056059
* | Merge "SnapdragonCamera: Fix ANR after capturing pictures continuously" into ↵Linux Build Service Account2016-09-071-3/+11
|\ \ | |/ |/| | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix ANR after capturing pictures continuouslyqimengp2016-08-251-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | When finish once capture picture, camera need get available space of SDCard/Internal storage and update available number to UI. It is a I/O operation and may block a few millisecond. Currently camera get available space in UI-Thread. So capturing pictures continuously may cause ANR, though it is happened rarely. By moving this operation to non-UI thread, can solve this issue. Change-Id: I397e07117f88e56cbe2ad0b893e2bad8b3075ab5 CRs-Fixed: 1022382
* | Merge changes I868c8584,I398ed793,I88c592f7,I9c81a8ae into ↵Linux Build Service Account2016-08-261-9/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0 * changes: SnapdragonCamera: Changing icon size SnapdragonCamera: Mono preview visibility change on pause SnapdragonCamera: ShutterSound control to cover long shot SnapdragonCamera: Fix for false Selfie mirror preview
| * | SnapdragonCamera: ShutterSound control to cover long shotJack Yoo2016-08-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Moving Shutter Sound setting check to cover longshot case as well. Change-Id: I88c592f710baf9347c689cd0f844d9fb2994ff1e CRs-Fixed: 1056059
| * | SnapdragonCamera: Fix for false Selfie mirror previewJack Yoo2016-08-181-3/+3
| |/ | | | | | | | | | | | | Preview for capture intent was applying mirror incorrectly. Change-Id: I9c81a8aecf5f28a968bb38214c5c94ec5d1e9021 CRs-Fixed: 1056065
* | Merge "SnapdragonCamera:Add intent interface for APT automation" into ↵Linux Build Service Account2016-08-251-1/+7
|\ \ | |/ |/| | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Add intent interface for APT automationjunjiez2016-08-161-1/+7
| | | | | | | | | | | | | | | | Add intent interface to allow APT changing the UI settings by adb command. Change-Id: I28276ed398a09dceca6c5e59c755339fb229d1fd CRs-Fixed: 1043197
* | SnapdragonCamera: Fix crash when switching between camera1, camera2Byunghun Jeon2016-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Camera1 uses CameraHolder for opening/releasing camera and it does not release right away when closing camera. This is done to optimize opening/closing but since Camera2 does not use CameraHolder, state is not proper when switching between camera1 and camera2. So ignore the timer and release right away when going from camera1 to camera2. Change-Id: Ibc40297817ebfca04e19097bd463f78aec4d75cd CRs-Fixed: 1019338
* | SnapdragonCamera: Shutter sound menuJack Yoo2016-08-161-4/+18
| | | | | | | | | | | | | | Shutter sound menu to choose on/off Change-Id: Id5ea22a837cd658c3278160a21c74b519f1bc212 CRs-Fixed: 1050663
* | SnapdragonCamera: Selfie Mirror modeJack Yoo2016-08-161-2/+38
|/ | | | | | | Selfie mirror menu for front camera1. Change-Id: I2e6845c9e25481106f51772b5d3dfd0a971a2be7 CRs-Fixed: 1050663
* Merge "SnapdragonCamera: reset the snapshot status when switch camera" into ↵Linux Build Service Account2016-08-111-0/+1
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: reset the snapshot status when switch cameraweijiew2016-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | When user quickly trigger the shutter button several times,it is possible that taking picture fail and casues trigger snapshot from start preview. To resolve issue, reset the snapshot status when switch camera. Change-Id: Ida4961d03668ac09e3fc35bff2d645e4d755eb10 CRs-fixed: 1042288
* | SnapdragonCamera: Fixed NPE when triggering snapshot from key buttonJay Wang2016-07-281-0/+1
|/ | | | | | | | | | When user triggers snapshot from key button, it is possible that the camera control menu is not initialized and causes NPE. To resolve issue, only process the snapshot request after control menu is initialized. Change-Id: I14f8739e48406d6008ae6e1d5463dffe997b0bd9 CRs-Fixed: 1045625
* Merge "SnapdragonCamera: Remove custom location permission request window" ↵Linux Build Service Account2016-07-251-3/+22
|\ | | | | | | into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Remove custom location permission request windowJay Wang2016-07-191-3/+22
| | | | | | | | | | | | | | | | When user enables the GPS locaion setting, use Android's run-time permission request interface to get the permission. Change-Id: Ib17171aeff5ccf20e2b00da08243dee1a3383611 CRs-Fixed: 1038039
* | SnapdragonCamera: Force removing preview coverJay Wang2016-07-181-4/+5
|/ | | | | | | | A workaround to remove preview cover after picture is taken, if preview cover is not removed right after preview started. Change-Id: I723d70fde6ecaf7302714daa6648c85d8a40d1b4 CRs-Fixed: 1016691
* Merge changes I07ef3392,Ie0b04a07 into camera.lnx.1.0-dev.1.0Camera Software Integration2016-07-011-3/+7
|\ | | | | | | | | | | * changes: SnapdragonCamera: Fix the crash caused by Ubifocus help menu SnapdragonCamera: Adjust the low memory device threshold
| * SnapdragonCamera: Fix the crash caused by Ubifocus help menuJay Wang2016-06-241-3/+7
| | | | | | | | | | | | | | | | | | In some cases, the Ubifocus UI operation is called from camera thread and caused the exception. To resolve the issue, make sure UI operation is done only in UI thread. Change-Id: I07ef3392577169ecd642bf98a6c39de3580e963d CRs-Fixed: 1032532
* | SnapdragonCamera: Fix the camera setting corruption issueJay Wang2016-06-211-2/+9
|/ | | | | | | | | | | | Two instances of camera preference were created and caused the wrong preference instance is referenced when changing the camera2 mode. Due to this, it corrupted the camera setting on the other camera device. To resolve the issue, create single instance of camera preference and re-use it. Change-Id: Ia1a6923a10b83e4c5777fb1318677c1f191942fb CRs-fixed: 1025776
* Merge "SnapdragonCamera: Add SettingsManager, scene, and filter" into ↵Camera Software Integration2016-06-071-6/+3
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-05-311-6/+3
| | | | | | | | | | | | | | | | | | | | | | Add SettingsManager to work as a database for settings. It will handle all dependencies and populate the values. Add scene mode and filter. Restructure UI and menu by combining them and leave the handling of settings to SettingsManager Change-Id: I185163fdddbffd29434e6a9c41b33be6d3388f88 CRs-Fixed: 1018118
* | SnapdragonCamera: disable instant capture in some cases.Jay Wang2016-05-261-20/+36
|/ | | | | | | | | | | 1. Disable instant capture when ZSL is off or advanced features are enabled 2. Change the instant capture option to support the selection of aggressive AEC and fast AEC CRs-Fixed: 998509 Change-Id: I60f7ed3a0fc93627dbf7527fbec2a60605aad683
* SnapdragonCamera: Fix incorrect focus modeJay Wang2016-05-021-1/+5
| | | | | | | | | | The camera device parameter was not re-set when the camera is switched back from camcorder mode. This causes the camera mode uses previous camera focus mode which was selected before switching to camcorder mode. CRs-Fixed: 1006900 Change-Id: I20bce0413d7f422da86acd44c39b27582593614d
* Merge "SnapdragonCamera: Fix auto HDR indication issue" into ↵Linux Build Service Account2016-04-171-18/+21
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix auto HDR indication issueJay Wang2016-04-071-18/+21
| | | | | | | | | | | | | | | | 1. Fix the logic on validating the auto HDR detection. 2. Move teh HDR indicator to more visible area CRs-Fixed: 999660 Change-Id: I797f69edc847b94f60c637373b80278783c3dac8
* | Merge "SnapdragonCamera: Adjusting view initialization" into ↵Linux Build Service Account2016-04-171-0/+6
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Adjusting view initializationJack Yoo2016-04-061-0/+6
| |/ | | | | | | | | | | | | | | Instead of removing and adding the entire root view, changing only core surface view on module change. Change-Id: I5c39cf23b2a58280f4e4e8484865bbed0b12e1cf CRs-Fixed: 979254
* | Merge "SnapdragonCamera: fix instant capture setting issue" into ↵Linux Build Service Account2016-04-171-6/+6
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: fix instant capture setting issueJay Wang2016-03-301-6/+6
| |/ | | | | | | | | | | | | | | | | | | | | The instant capture flag is set in a delayed runnable and causes a race condition that the flag is not set before camera thread configures the camera parameters. To resolve the issue, sets the instant capture flag in the main thread. Change-Id: Ic44a5df4d10fb2c641835e94cd4ec6790c759b36 CRs-Fixed: 994361
* | Merge changes I2139274e,I1d18d936 into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-04-171-6/+0
|\ \ | | | | | | | | | | | | | | | * changes: SnapdragonCamera: Fix occasional touch AF/AEC detection failure. SnapdragonCamera: Hide remaining photo counter
| * | SnapdragonCamera: Fix occasional touch AF/AEC detection failure.Jay Wang2016-04-011-6/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | 1. Fix the issue that during pause/resume, the preview region was not set properly and focus manager ignore bottom part of preview region. 2. On device with sensitive touch screen, single tap can be detected as scroll gesture. Make change to consider scroll gesture as single tap gesture if it is not the left swipe gesture. Change-Id: I2139274e60799eac866b8bb70ea66144548b5845 CRs-Fixed: 997843
* | SnapdragonCamera: hide the preview surface during suspendJay Wang2016-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Occasionally, the previous preview frame is presented and caused the screen flashing, when continuously triggering suspend/resume. To resolve the issue, hide the preview surface during suspend and make it visible during resume. This helps to clear the remaining preview frames in the buffer. CRs-Fixed: 991416 Change-Id: I96fff0fdae6bd14263f33b1a9032604596cf49c1
* | SnapdragonCamera: Camera2 add zoom supportByunghun Jeon2016-03-301-0/+5
|/ | | | | | | Add zoom support to Camera2 CRs-Fixed: 989750 Change-Id: Id6b558ff5215f04ca7c201b1d1807521d615c353
* SnapdragonCamera: Remove accessing to dialog stringsJay Wang2016-03-291-4/+4
| | | | | | | | | | Accessing to translatable strings can lead to unexpected behavior when non-English is selected as system language. Making change to remove any accessing to translatable strings. Change-Id: I687abdff984bf0e5680c34861fac8c1271b88ead CRs-Fixed: 993382
* SnapdragonCamera: Turn on face detection for beautificationJack Yoo2016-03-281-0/+10
| | | | | | | Keep turning on face detection while beautification is on. Change-Id: I6039b6fecf8cc8d11dea925eff18af6ddc9a0da7 CRs-Fixed: 986633
* SnapdragonCamera: Turn off LONGSHOT on ubifocus scene modeJack Yoo2016-03-221-1/+3
| | | | | | | Turning off LONGSHOT mode to off when ubifocus scene mode is enabled. Change-Id: I5a1ce6a2c9fa08715da40a41f4aae694bd7f8654 CRs-Fixed: 984742