summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Add OneUI to Camera2Byunghun Jeon2016-09-2772-817/+1802
| | | | | | | | | | Add new UI called OneUI to Camera2. It replaces icons, adds 2 new activities for scene menu and setting menu. There is no module change anymore Change-Id: If712e6af7bbc29726dae387168aefbcd2d7c1ea9 CRs-Fixed: 1066519
* SnapdragonCamera: Use persist to set Camera1/Camera2 modeByunghun Jeon2016-09-2710-26/+9
| | | | | | | | | 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 face detection with zoom issueByunghun Jeon2016-09-272-0/+5
| | | | | | | Account for zoom changes when drawing face detection UI Change-Id: I61e7786378ccff82fce095bf5c46ea7af352975c CRs-Fixed: 1066444
* SnapdragonCamera: Fix Camera launch latencyByunghun Jeon2016-09-272-4/+4
| | | | | | | | | Call setModuleFromIndex() first before calling setContentView() so that camera open will happen faster Move query() cursor after setModuleFromIndex() Change-Id: I8407cb795248f4b814d8292014b6ddc79d2af7f8 CRs-Fixed: 1062069
* SnapdragonCamera: Resolve video bitrate overflow issueJay Wang2016-09-271-1/+1
| | | | | | | | | | The video bit rate calculation can cause integer overflow due to multiplying two huge numbers. To resolve the issue, do the division before the multiplication. The same fix is already in camera1 implementation. Change-Id: Iafdb3d6687f5ecf81766002a052195c7ce2d963b CRs-Fixed: 1030274
* SnapdragonCamera: Filter video size based on supported camcorder profileJay Wang2016-09-271-2/+14
| | | | | | | | Supported video size needs to be finalized by checking the supported camcorder profile. CRs-Fixed: 1066540 Change-Id: I131779263cfee229aa82a97453d7ba0402031717
* 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: Preview button should not work in secure mode" into ↵Linux Build Service Account2016-09-264-30/+43
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Preview button should not work in secure modeJing (Mia) Wang2016-09-124-30/+43
| | | | | | | | | | | | | | | | | | When camera is in secure mode, it will still listen to the preview event although the circle is invisible to the user. So disable the event listener of preview button. Change-Id: Ic4f1dbf32163a7f210e3f4b87599699f44e8f7b0 CRs-Fixed: 1002685
* | Merge "SnapdragonCamera:Fix Face circles are drawn at an offset" into ↵Linux Build Service Account2016-09-262-6/+4
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera:Fix Face circles are drawn at an offsetjunjiez2016-09-142-6/+4
| |/ | | | | | | | | | | | | | | | | | | The layoutParam of FaceView is not the same as prview surface, and cause the offset.Remove setting layoutParam in the method onStartFaceDetection() and calculate the screen ratio in the VideoModule to get the correct layoutParam for FaceView Change-Id: I9bc2759bcb50514c183628e9d4f31d2f54437dc7 CRs-Fixed: 1064295
* | Merge "SnapdragonCamera: Screen goes black when saving panoramic pictures" ↵Linux Build Service Account2016-09-262-4/+4
|\ \ | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Screen goes black when saving panoramic picturesweijiew2016-09-142-4/+4
| |/ | | | | | | | | | | | | | | Layout() method can't be triggered and caused saving view missing when the phone was upside down, so set the view to invisible instead of gone Change-Id: Id331d14c0795a47b3acb6139089464742f40c404 CRs-Fixed: 1066232
* | Merge "SnapdragonCamera: Set GPS location info for Camera2 photos" into ↵Linux Build Service Account2016-09-261-0/+9
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Set GPS location info for Camera2 photosJay Wang2016-09-131-0/+9
| |/ | | | | | | | | | | | | | | Set the GPS location info for Camera2 photos if the options is enabled and there is a valid location returned from LocationManager. CRs-Fixed: 1061772 Change-Id: I3c385304912edba806439f233407bdb42a57cbfc
* | Merge changes I03f9dda1,I6cf67330 into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-09-262-43/+94
|\ \ | | | | | | | | | | | | | | | * changes: SnapdragonCamera: Fix cropping issues with CS output SnapdragonCamera: Ensure smooth quit during cs processing
| * | SnapdragonCamera: Fix cropping issues with CS outputJay Wang2016-09-151-3/+12
| | | | | | | | | | | | | | | | | | | | | Fix cropping issues with CS output for scenes +6ft. CRs-Fixed: 1058843 Change-Id: I03f9dda175cbba2cdbb5ec1d4933136525feef4a
| * | SnapdragonCamera: Ensure smooth quit during cs processingJay Wang2016-09-152-40/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure a smooth quit transition during Clearsight processing. Move image reader/writer disposal to after handler quit. Don't toast Clearsight success/fail until after all tasks are complete. CRs-Fixed: 1058833 Change-Id: I6cf6733051d1947ea65a003b9bacb9d575c6ef67
* | | Merge "SnapdragonCamera: Always strong release when going to Camera2" into ↵Linux Build Service Account2016-09-261-1/+2
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Always strong release when going to Camera2Jay Wang2016-09-151-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | Always strong release the camera when transitioning to CaptureModule/Camera2 mode. CRs-Fixed: 1058832 Change-Id: I51efd338879a93a2c7b84f025c274e3147e4d82f
* | | Merge "SnapdragonCamera: Wait for aux camera to close before closing main" ↵Linux Build Service Account2016-09-261-30/+21
|\ \ \ | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Wait for aux camera to close before closing mainJay Wang2016-09-151-30/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Wait for aux camera to finish closing before closing the main camera. Timeout is set at 2 seconds after which, we will throw exception. CRs-Fixed: 1054487, 1054441 Change-Id: I707d563eb7481da40e2d1ccb6b0941695dd54cf6
* | | Merge "SnapdragonCamera: Add exposure lock flag to capture request." into ↵Linux Build Service Account2016-09-261-0/+1
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Add exposure lock flag to capture request.Jay Wang2016-09-151-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Add the exposure lock flag to the capture request as well. For burst captures, exposure was fluctuating between shots. CRs-Fixed: 1061989 Change-Id: I3a498161b4dd5400962c004254f3974a4ead3851
* | | Merge "SnapdragonCamera: Fix memory leak when updating thumbnails." into ↵Linux Build Service Account2016-09-262-6/+24
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix memory leak when updating thumbnails.Jay Wang2016-09-152-6/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Fix a memory leak with jpeg data buffers saved for updating thumbnails. Ensure that all references are freed and released when exiting. CRs-Fixed: 1054441 Change-Id: Idc79f51f0e70b0b3e39d614ff3dd7f5d1f85aaad
* | | Merge "SnapdragonCamera: Pictures were rotated when the device is in flat ↵Camera Software Integration2016-09-211-7/+8
|\ \ \ | | | | | | | | | | | | position" into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Pictures were rotated when the device is in flat positionweijiew2016-09-081-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally, the picture taken by front camera needs to rotate 270 degree and the picture taken by rear camera needs to rotate 90 degree. Launch camera app when the device is in a close to flat position, camera app can’t get device’s orientation. The picture will not be rotated when the orientation is unknown. Change-Id: I41d19f162f28aa6838b0246f14475480c8703e06 CRs-Fixed: 1063452
* | | | Merge "SnapdragonCamera: Fix OutOfBoundsException in monkey test" into ↵Camera Software Integration2016-09-211-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Fix OutOfBoundsException in monkey testmingwax2016-09-071-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In monkey test, set defaultValue operation in xml file, parsing XML in framework code, pref.getValue() return null when defaultValue not ready. When findIndexOfValue() failed to get the index of the value, it will return -1, but -1 can`t be the index of the array, it will cause exception. So if can`t find the index of the value, just go back and don`t execute the following code. Change-Id: I2b5595d7d558e3ab3863287e3d1424df141c5d59 CRs-Fixed: 1063228
* | | | Merge "SnapdragonCamera:Force close when set video high framerate as HSR240" ↵Camera Software Integration2016-09-211-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera:Force close when set video high framerate as HSR240weijiew2016-09-071-4/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera can't support all the video high framerate. When it's not supported, the value of framerate getting from camera device is "off".It will cause number format exception when parsing "off" to integer. Change-Id: Ie6d4840f96de4eeecad4bcf6a71ca2404ff8834a CRs-Fixed: 1063218
* | | | 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 Camera FC in split screen" into ↵Camera Software Integration2016-09-211-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:Fix Camera FC in split screenjunjiez2016-09-071-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When camera launched in in split screen, it shows in landscape, but ImageViews in the land layout of CameraControls are not RotateImageViews, exception occurred when CameraControls.setOrientation is invoked. Change them to RotateImageViews to avoid exceptions. Change-Id: I6fe0c04e2a6f1c4726a35adba697fbffbac5c0bd CRs-Fixed: 1063479
* | | Merge "SnapdragonCamera: Change the default maker for panorama" into ↵Camera Software Integration2016-09-141-1/+5
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Change the default maker for panoramaweijiew2016-08-311-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | when adding EXIF information for panorama picture, the maker was setted to QCOM-AA if the maker getting from system property is unknown Change-Id: I17c510d2d1056884af2978591001efc184cb8717 CRs-Fixed: 1052731
* | | Merge "SnapdragonCamera:Fix location permission dialog disappeared" into ↵Camera Software Integration2016-09-143-14/+12
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:Fix location permission dialog disappearedjunjiez2016-08-303-14/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Request loaction permission for the first time of launching Camera, and add android:configChanges in manifest to avoid PermissionActivity to be created when rotate screen. Change-Id: Ibaffad1629830beccf41e32ea5e224abd765ffb6 CRs-Fixed: 1059678
* | | 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:Fix OutOfBoundsException in monkey test" into ↵Camera Software Integration2016-09-141-1/+5
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:Fix OutOfBoundsException in monkey testjunjiez2016-08-301-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | when findIndexOfValue() failed to get the index of the value, it will return -1,but -1 can't be the index of the arry,it will cause exception.So if can't find the index of the value,return the default support value instead. Change-Id: I2cd44a20146b35492b5c697c2c4ba5a6cd0cd095 CRs-Fixed: 1060916
* | | Merge "SnapdragonCamera:Fix NullPointerException in monkey test" into ↵Camera Software Integration2016-09-141-2/+5
|\ \ \ | |_|/ |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera:Fix NullPointerException in monkey testjunjiez2016-08-301-2/+5
| |/ | | | | | | | | | | | | | | | | When mMenuLayout was null, invoking sendTouchToMenu in VideoUI will cause NullPointerException.Add a judgement to avoid mMenuLayout to be null. Change-Id: I7278d01fe62928efd93fade919ffd474b7ce6ebc CRs-Fixed: 1060918
* | Merge "SnapdragonCamera:Fix Camera GTS failture issue." into ↵Linux Build Service Account2016-09-072-14/+10
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera:Fix Camera GTS failture issue.junjiez2016-09-012-14/+10
| |/ | | | | | | | | | | | | | | | | | | GTS test will fail if use permission activity to return the result, so set FLAG_ACTIVITY_FORWARD_RESULT flag for the intent and let CameraActivity return the result directly. And add URI read permission to the return intent Change-Id: I224789bbd430d977234d2bcbea4e38e957b81142 CRs-Fixed: 1059964