summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Dialog display incompletely in landscape mode" into ↵Camera Software Integration2016-12-225-20/+115
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Dialog display incompletely in landscape modeweijiew2016-12-155-19/+114
| | | | | | | | | | | | | | Create a new layout for landscape mode CRs-Fixed: 1099373 Change-Id: Ie505c6ef8795e0b8a8b3424afde7cb46fc368136
* | Merge "SnapdragonCamera: fix setting menu bug" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-221-1/+1
|\ \
| * | SnapdragonCamera: fix setting menu bugCullum Baldwin2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | Fix a bug where openning the Camera2 settings menu causes a crash. Change-Id: I838eeef9f79b04281d00eaba5e816c542a4d3ea2
* | | Merge "SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2" into ↵Camera Software Integration2016-12-223-2/+101
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2yingrenw2016-12-153-2/+101
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description: Solve the HFR Crash on 720 120FPS with Camera 2 when recording. Nullpointer crash. CaptureRequest native data copy don't have the tag data. Confirm the tag data can be copied. Change-Id: I745a09b789864db9cdbbe5cfcc8bcbc941e01bf3 CRs-Fixed: 1099749
* | | Merge "SnapdragonCamera: Fix FC NullpointerException in PanoCapture" into ↵Camera Software Integration2016-12-221-12/+18
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix FC NullpointerException in PanoCapturemingwax2016-12-141-12/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | Add mutex lock to ensure the mBitmapstream value is not changed to null. CRs-Fixed: 1101177 Change-Id: I3095a3d2f0b25a5ba929f16ebc75af81a8950653
* | | Merge "SnapdragonCamera: The "x" of the scene mark is too large" into ↵Camera Software Integration2016-12-202-4/+10
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: The "x" of the scene mark is too largeweijiew2016-12-142-4/+10
| |/ / | | | | | | | | | | | | | | | | | | Change the "x" of the scene mark to a small size. CRs-Fixed: 1101206 Change-Id: I7f64cd2b68ba30881309e7e5cb3a013e9168661a
* | | Merge "SnapdragonCamera: Turn off "Beep during countdown" doesn't work" into ↵Camera Software Integration2016-12-201-1/+1
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | 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
* | | Merge "SnapdragonCamera:Modify beautify interface" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-201-0/+7
|\ \ \
| * | | SnapdragonCamera:Modify beautify interfaceweijiew2016-12-131-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable FilterMode button and SceneMode button when Beautify is enabled; Disable FilterMode button and Beautify button when SceneMode is none automatic;Disable SceneMode button and Beautify button when FilterMode is enabled. Change-Id: I20ce8c836740c97e35f9ba20789fab31398f7270 CRs-Fixed: 1099382
* | | Merge "SnapdragonCamera: Fix FC caused by session null" into ↵Camera Software Integration2016-12-201-1/+1
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix FC caused by session nullqimengp2016-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix FC caused by session null Change-Id: I8f3b98cc47a10f25715bbb4c81accd87b2de432c
* | | | Merge "SnapdragonCamera: Fix shutter button grey" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-201-2/+13
|\ \ \ \
| * | | | SnapdragonCamera: Fix shutter button greyqimengp2016-12-131-2/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Shuter button will be grey in some situation. we need to reset Button state and state machine. Change-Id: I0c8170ff8338297659405d97ba9a7e2ae64b8f5f
* | | | Merge "SnapdragonCamera: Fix FC caused by mSession Null" into ↵Camera Software Integration2016-12-202-44/+95
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix FC caused by mSession Nullqimengp2016-12-132-44/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are lots of FC caused by mCameraDevice/mBuilder/mSession Null, In the condition: 1. Between opening camera app and not ready to preview. 2. App pause, and then resume to app 3. Restart session by makeup or flash mode change 4. restart all by change camera devices Checking NULL and add illegal state handler is a work around way. Change-Id: I26edfbde8944280c51f4a05f91deacb76e24b6f3
* | | | Merge "SnapdragonCamera: EIS is not enabled when enabling on the UI" into ↵Camera Software Integration2016-12-201-1/+1
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: EIS is not enabled when enabling on the UIweijiew2016-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Stabilization on is not setted in request CRs-Fixed: 1099751 Change-Id: I6c905d26f459f0b232019830bca446e2d9f624d4
* | | | Merge "SnapdragonCamera: Fix don`t save the value about focus distance" into ↵Camera Software Integration2016-12-204-16/+49
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix don`t save the value about focus distancemingwax2016-12-134-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don`t save the focus distance value when the user change the value. Add code for saving the value in xml when the user change the value. CRs-Fixed: 1095942 Change-Id: Ic2b88d67d068c17afcc12546028e99454070b8ab
* | | | Merge "SnapdragonCamera: Fix Don`t set setMaxFileSize when videoing" into ↵Camera Software Integration2016-12-201-24/+171
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix Don`t set setMaxFileSize when videoingmingwax2016-12-131-24/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the setMaxFileSize value when start recording video. CRs-Fixed: 1098808 Change-Id: I4fccb8b20040f3d56ce01626d5eedf671cc77b8f
* | | | Merge "SnapdragonCamera: Camera2 force close when turn on/off beauty" into ↵Camera Software Integration2016-12-201-7/+6
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Camera2 force close when turn on/off beautyweijiew2016-12-131-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Session was closed, but new session didn't create Change-Id: I09a03eef6386d4ebd7a988454503024af7ce1961 CRs-Fixed: 1066519
* | | | Merge "SnapdragonCamera: Fix ProMode`s AWB Exposure value changed in First" ↵Camera Software Integration2016-12-201-6/+9
|\| | | | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix ProMode`s AWB Exposure value changed in Firstmingwax2016-12-131-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ProMode the code is 109, but not set the value, caused use the default value, default value could set the AWB is 1,and set the Exposure is 0; Add the ProMode code in dependency.json CRs-Fixed: 1097742 Change-Id: I64b1e6e020e8d6bbe2b6a4dcbbec4e0957bcb267
* | | | Merge "SnapdragonCamera:Avoid switching camera in countdown" into ↵Camera Software Integration2016-12-201-1/+1
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:Avoid switching camera in countdownjunjiez2016-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When countdown is over, there is a litter time before capture, and switch camera as this time will cause exception, so show the UI after both countdown and capture are over. Change-Id: I69f90d024f1fc70281db3ba38d9e078581e57d14 CRs-Fixed: 1094222
* | | | Merge "SnapdragonCamera:Fix FC cause by Null pointer" into ↵Camera Software Integration2016-12-201-0/+6
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:Fix FC cause by Null pointerqimengp2016-12-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clearSight is failed, handleTimeout() is invoked to reset clearsight Engine, but ClearsightProcessHandler is still working and try to access null pointer object. By adding protect of null pointer can fix this issue. Change-Id: I4722721f3715077ec8303c4d14693ae4c1484420
* | | | Merge "SnapdragonCamera:Fix bestPicture display in wrong size" into ↵Camera Software Integration2016-12-201-3/+3
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:Fix bestPicture display in wrong sizejunjiez2016-12-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the size of the imageview to match parent and show the image with its original ratio of width and height to avoid showing in wrong size when rotate the screen. Change-Id: I2b2e68f36248700e9dc21082086854516eb4cac0 CRs-Fixed: 1096576
* | | | Merge "SnapdragonCamera: Fix ProMode refresh UI issue" into ↵Camera Software Integration2016-12-202-0/+5
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix ProMode refresh UI issuemingwax2016-12-132-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WB and Exposure value don`t update when changed in the setting View. Update the value of WB and Exposure when resume the PreMode. CRs-Fixed: 1098270 Change-Id: I4f42555dd59e17de86e55dfaaa0f7a027e19c28c
* | | | Merge "SnapdragonCamera:Fix front camera preview flipped" into ↵Camera Software Integration2016-12-202-0/+12
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:Fix front camera preview flippedjunjiez2016-12-132-0/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | Modidfy render script to implement new flip way according to the front camera mounting position. Change-Id: I5681447aa17c0499bcb7dc47eef6d4793ee68818 CRs-Fixed: 1097179
* | | Merge "SnapdragonCamera: Noise reduction cann't be turn on" into ↵Camera Software Integration2016-12-201-2/+5
|\ \ \ | |/ / |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Noise reduction cann't be turn onweijiew2016-12-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Noise reduction has three value(off,fast, high quality), but it was implemented as a SwitchPreference, value of noise reduction can't be persisted. so changing SwitchPreference to ListPreference CRs-Fixed: 1088262 Change-Id: I3faaa433b595b1b8e8c2afbb71f4d42aca5d5ba2
* | | Merge "SnapdragonCamera: Disable the flash button in ChromaFlash mode" into ↵Camera Software Integration2016-12-131-2/+7
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Disable the flash button in ChromaFlash modeweijiew2016-12-051-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the flash button in ChromaFlash mode Change-Id: I8c2b9374f91f9125bd70e81aab458938e687adbe CRs-Fixed: 1096503
* | | | Merge "SnapdragonCamera: Show label and dialog when switch to new scene ↵Camera Software Integration2016-12-1336-5/+562
|\| | | | |/ / |/| | | | | mode" into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Show label and dialog when switch to new scene modeweijiew2016-12-0536-5/+562
| | | | | | | | | | | | | | | | | | | | | Show label and instructional dialog when switch to new scene mode Change-Id: I75becaa9bb898ca9ef68c94b1195069131745f14 CRs-Fixed: 1091210
* | | Merge "SnapdragonCamera: Keep screen on when recording the video" into ↵Camera Software Integration2016-12-111-1/+29
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Keep screen on when recording the videomingwax2016-11-301-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the actions to keep the screen on or off. (1) We always keep the screen on when click video button for recording video. (2) We keep the screen on for 2 mins when click video button for stop recording video. (3) We clear the flag(FLAG_KEEP_SCREEN_ON) when exit the camera. CRs-Fixed: 1095512 change-Id: I283c29882f0654315536afbafc5072491343a38f
* | | | Merge "SnapdragonCamera:Fix crash when zooming" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-111-2/+2
|\ \ \ \
| * | | | SnapdragonCamera:Fix crash when zoomingjunjiez2016-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The args of the message CANCEL_TOUCH_FOCUS is wrong, and the handler always get 0 as the cameraId, when mono-only is enabled, the cameraId is 2. Change-Id: Ib6a9a5831d0403bd9d9df6959ed35440ac42cc77 CRs-Fixed: 1092598
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 22:08:16 +0000