summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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: 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
* | | | Merge "SnapdragonCamera:Modify Camera2 VideoRecording UI" into ↵Camera Software Integration2016-12-116-45/+95
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera:Modify Camera2 VideoRecording UIjunjiez2016-12-056-45/+95
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify Camera2 VideoRecording UI and make it look like the same as the design document shows. Change-Id: I41ea3db7312847fe56ad9d8e73dfa92b030e79e2 CRs-Fixed: 1093507
* | | | Merge "SnapdragonCamera:closing sequence improvement" into ↵Camera Software Integration2016-12-111-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera:closing sequence improvementjunjiez2016-11-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when this is any camera with errors, invoke closeCamera to close them in sequence, do not close the one with errors first. Change-Id: I5cb2c206c16535f4a823c3a5545539cdbed5b6c7 CRs-Fixed: 1095549
* | | | | Merge "SnapdragonCamera:Camera reinit with wrong id" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-111-1/+1
|\ \ \ \ \
| * | | | | SnapdragonCamera:Camera reinit with wrong idjunjiez2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we swith sceneMode, Camera will call getMainCameraId() to get the camera id to reinit,but the camera id is wrong because valus in SettingsManager is null, so use init() instead, it will get camera id from preference. Change-Id: I1d7dc95ca5231ab1f98ae64ac5ffd0f6aae9bf7c CRs-Fixed: 1088851
* | | | | | Merge "napdragonCamera:Modify Clear-sight match rules" into ↵Camera Software Integration2016-12-111-9/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | | napdragonCamera:Modify Clear-sight match rulesjunjiez2016-12-021-9/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some scenarios, exposure time will be longer and cause the timestamps not matched.Compare both SOF and EOF, discard the image pair when both the differences are bigger than defined Change-Id: I8b67bea5836df42226d9f0a70ea4937d01e0a26b CRs-Fixed: 1084329
* | | | | | Merge "SnapdragonCamera: Path should be reseted in onLayout method" into ↵Camera Software Integration2016-12-111-0/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Path should be reseted in onLayout methodmingwax2016-11-301-0/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When proMode is inVisible, onLayout method is called in the landscape screen, the screen will draw one more curve by path. Add judgment condition, path should be reseted in onLayout method. CRs-Fixed: 1094491 Change-Id: Id76e2234517bfef662b9687e997219e693e907b1
* | | | | Merge "SnapdragonCamera: make copy of location before altering timestamp" ↵Camera Software Integration2016-12-091-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: make copy of location before altering timestampJay Wang2016-11-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a copy of saved location object before altering timestamp since we may end up re-using the same location object down the line. CRs-Fixed: 1007285 Change-Id: Ifa8b7cd3ecfe2dede5cfa155818f48f51f4405f1
* | | | | Merge "SnapdragonCamera:Fix preview is flipped on 8996" into ↵Camera Software Integration2016-12-052-8/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera:Fix preview is flipped on 8996junjiez2016-11-292-8/+21
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modidfy render script to implement flip another way not 90 according to the camera mounting position. Change-Id: Id6b305fd2b00bc4193f1ba73d4253794e04ee3a6 CRs-Fixed: 1087483
* | | | | Merge "SnapdragonCamera:Fix IllegalStateException in reprocess" into ↵Camera Software Integration2016-12-051-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera:Fix IllegalStateException in reprocessjunjiez2016-11-281-0/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clearSight is failed, handleTimeout() is invoked to release all the imges,but ClearsightProcessHandler is still working and try to access closed images, catch the exception to avoid crash. Change-Id: If9cf36f79f23f2a5e3b7efc4f5c0a2c1e36542b5 CRs-Fixed: 1094558
* | | | Merge "SnapdragonCamera: Camera2 force close after focused" into ↵Camera Software Integration2016-12-011-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Camera2 force close after focusedweijiew2016-11-241-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handler message leaks the camera id, the camera id is set to 0 when handleing Message.As we known, rear camera id is 0 and front camera id is 1. Focus action runs normall when switching to rear camera, but focus action will lead to force close when switching to fornt camera. Change-Id: I7795b7cd0c34c256d1ad0066d13a51ed54cec67d CRs-Fixed: 1094009
* | | | Merge "SnapdragonCamera: Disable continuous shot in chroma flash mode" into ↵Camera Software Integration2016-12-011-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Disable continuous shot in chroma flash modeweijiew2016-11-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continuous shot should be disabled when scene mode is chroma flash. CRs-Fixed: 1094053 Change-Id: I405768fb11da85848098ad10059355759fbac9b9
* | | | | Merge "SnapdragonCamera: GPS location can't be turn On in camera settings" ↵Camera Software Integration2016-12-016-15/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: GPS location can't be turn On in camera settingsweijiew2016-11-246-15/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "SnapdragonCamera: Disable color effects when scene mode is ↵Camera Software Integration2016-12-012-2/+68
|\| | | | | | | | | | | | | | | | | | | non-automatic" into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Disable color effects when scene mode is non-automaticweijiew2016-11-242-2/+68
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | SceneMode and color effect filter can't be open at the same time. Color effect filter should be disabled when scene mode was non-automatic CRs-Fixed: 1080667 Change-Id: Icabfe937c438f38047d073af61b9ae4e1e0dcbbc
* | | | Merge "SnapdragonCamera: Scene mode button was enabled when chroma flash was ↵Camera Software Integration2016-12-011-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | on" into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Scene mode button was enabled when chroma flash was onweijiew2016-11-241-1/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scene mode button should be disabled when chroma flash was on, but it was enabled when the animation of setting menu dismissing was end. Change-Id: I902ced210d410f07a3db5113be7dd922ea9be74c CRs-Fixed: 1089451
* | | | Merge "SnapdragonCamera: Fix Camera2 FC AlertDialog occur WindowLeaked" into ↵Camera Software Integration2016-12-011-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Fix Camera2 FC AlertDialog occur WindowLeakedmingwax2016-11-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dialog occur WindowLeaked when attached the activity is destroyed. Add judgement whether the activity is finishing before show dialog, if true return, false show dialog. CRs-Fixed: 1082314 Change-Id: I28fab4c0253d2524a05e7e18a78d7651bdc9ce4a
* | | | | Merge "SnapdragonCamera:Modify beautify interface" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-019-21/+89
|\ \ \ \ \
| * | | | | SnapdragonCamera:Modify beautify interfacejunjiez2016-11-159-21/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify beautify interface, make it the same as the design. Disable FilterMode button and SceneMode button when beautify is enabled. Change-Id: I0ba976973ff06df4e17a93c76781127dda090416 CRs-Fixed: 1084369
* | | | | | Merge "SnapdragonCamera:Fix wrong Countdown tip position" into ↵Camera Software Integration2016-12-011-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | | SnapdragonCamera:Fix wrong Countdown tip positionjunjiez2016-11-221-3/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hight and width of CountDownTitle will be zero when it's not measured.Use screen width instead of its width and if its height is zero, measure it first,then get the height. Change-Id: I31a4aa5d4796f0b6f8085161e7eb60fcc07b2bbb CRs-Fixed: 1083455
* | | | | | Merge "SnapdragonCamera: Camera switches from bayer and mono on switching to ↵Camera Software Integration2016-12-011-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | front camera" into camera.lnx.1.0-dev.1.0
| * | | | | | SnapdragonCamera: Camera switches from bayer and mono on switching to front ↵weijiew2016-11-241-0/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | camera Dual camera was not supported, camera was switched one by one. Solution: only select bayer when user switch front camera to rear camera Change-Id: I814552aed1ee8889f309cb5de8df84f9bee42093 CRs-Fixed: 1088821
* | | | | | Merge "SnapdragonCamera: ANR when open photo just taken" into ↵Camera Software Integration2016-12-011-1/+25
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: ANR when open photo just takenjianhuac2016-11-231-1/+25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera app stop preview when leave camera app to gallery, and may take a long time and block the main thread in extreme cases. Set a timeout to avoid blocking the main thread long time and cause ANR. Change-Id: I403b4248f6cbeb7e97b6e5704dd29b8b8b911363 CRs-Fixed: 1091688
* | | | | Merge "SnapdragonCamera: Fix Camera2 FC click video btn for many times" into ↵Camera Software Integration2016-11-282-6/+97
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Fix Camera2 FC click video btn for many timesmingwax2016-11-182-6/+97
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RootCause: Design fault, missing code which capture exception. Code is not robust. Solution: Add code for catching exception and add listener for MediaRecorder occur error. Optimize toast tips. CRs-Fixed: 1088238 change-Id: I48fd8f91d1fc24ddc458f28c1eadd277bc3b34d9
* | | | | Merge "SnapdragonCamera: Some options are not translated to Chinese" into ↵Camera Software Integration2016-11-282-7/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Some options are not translated to Chineseweijiew2016-11-172-7/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String was hard code. Move string to string.xml Change-Id: I0c0eefea766869606a125c2f08b1ba04e4b29084 CRs-Fixed: 1088128
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 21:07:44 +0000