summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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: 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
* | | | Merge "SnapdragonCamera: Camera2 force close when zoom focus ring in video ↵Camera Software Integration2016-11-281-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | mode" into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Camera2 force close when zoom focus ring in video modeweijiew2016-11-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When starting recording, a new captureSession will be created and the old captureSession will be closed, but it still use old captureSession to apply new zoom value. Change-Id: I3c8b1f5346eddc2ffbb454a94cd401812276e4a5 CRs-Fixed: 1089903
* | | | | Merge "SnapdragonCamera: Shutter button was disabled after switching to ↵Camera Software Integration2016-11-282-1/+22
|\| | | | | | | | | | | | | | | | | | | video mode" into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Shutter button was disabled after switching to video modeweijiew2016-11-172-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Video mode was not supported when triggering continue shot, when continue shot was triggered, video button was not disabled and led to shutter button can't restore to enable. Solution: Disable video button when triggering continue shot;disable continue shot when recording video Change-Id: If30323e6a3f9b39ce6c5f3a8c74d78ac7526c382 CRs-Fixed: 1085338
* | | | | Merge "SnapdragonCamera: Selfie mirror doesn't work when open the Continuous ↵Camera Software Integration2016-11-282-6/+35
|\| | | | | | | | | | | | | | | | | | | shot" into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Selfie mirror doesn't work when open the Continuous shotweijiew2016-11-182-6/+35
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Selfie mirror doesn't support continuous shot. Disable continuous shot when selfie mirror is turned on Change-Id: I4e17895f0b15d04dd6f0f56eae17f091104e3a59 CRs-Fixed: 1086429
* | | | Merge "SnapdragonCamera: Improve onResume" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-282-14/+44
|\ \ \ \
| * | | | SnapdragonCamera: Improve onResumeJay Wang2016-11-142-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create session without waiting for surface to be ready and start preview when surface is ready. This improves latency Change-Id: I1d4aee1c854c20c9e1e54a0d513da94265c1bf78 CRs-Fixed: 1066519
* | | | | Merge "SnapdragonCamera: Add ProMode" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-2831-21/+779
|\| | | |
| * | | | SnapdragonCamera: Add ProModeByunghun Jeon2016-11-1431-21/+779
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ProMode. User can change iso, white balance, exposure, and focus mode using this new scene mode Change-Id: I58885d3a05d6d9e8264e58cb8c4de2e1f13646b0 CRs-Fixed: 1089100
* | | | | Merge "SnapdragonCamera: Fix can`t swap from icon for camera" into ↵Camera Software Integration2016-11-281-29/+55
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Fix can`t swap from icon for cameramingwax2016-11-151-29/+55
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RootCause: Design fault, When the user set lockscreen(Pattern or Password) , Sliding camera icon from the lock screen interface, jump to the GrantPermissionsActivity interface which lack of access to the flag property verification. The flag in GrantPermissionsActivity`s interface is FLAG_KEEP_SCREEN_ON. Solution: Reconstruction and redesign of the process. When the user set lock screen, camera verificate the permission which is critical Permissions. when cameraApp has missed of any one of the three critical Permissions, CameraApp show dialog which tell the user missing the critical permission and finish cameraActivity. If the cameraApp has the three critical Permissions, the user can enter the camera from the lockScreen. Change-Id: Ic13c376025bf4afeceb14a24ec558e9a1179a059 CRs-Fixed: 1088278
* | | | Merge "SnapdragonCamera: Do not call cancel auto focus on startup" into ↵Linux Build Service Account2016-11-221-3/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | camera.lnx.1.0-dev.1.0
| * | | 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
* | | | Merge "SnapdragonCamera: Fix camera can`t enter setting in pattern lock" ↵Camera Software Integration2016-11-157-7/+47
|\ \ \ \ | | | | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Fix camera can`t enter setting in pattern lockmingwax2016-11-107-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RootCause: Missing flag of WindowManager.LayoutParames in SettingsActivity.java and SceneModeActivity.java. Solution: (1) Add windowManager.LayoutParams.FLAG_SHOW_WHEN _LOCKED in SettingsActivity.java and SceneModeActivity.java. (2) Change SettingsManager`s single instance, and guarantee SettingsManager only one instance. (3) When SettingsActivity.java and SceneModeActivity.java is invisible status, finish them and ensure data is updated in a timely manner. Change-Id: I3ac24b9b181055382849550e585d3be726e71595 CRs-Fixed: 1084871
* | | | | Merge "SnapdragonCamera:Fix crash when settingsManager is null" into ↵Camera Software Integration2016-11-151-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera:Fix crash when settingsManager is nulljunjiez2016-11-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After change the permissions of SnapdragonCamera, SettingsManager will be null, and caused exception in SettingsActivity, when SettingsManager is null, SettingsActivity will be finished. Change-Id: I6dcf541feae0265e0a5479b246f74880fc03433c CRs-Fixed: 1084376
* | | | | | Merge "SnapdragonCamera:Fix crash when failed to set param" into ↵Camera Software Integration2016-11-151-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | | SnapdragonCamera:Fix crash when failed to set paramjunjiez2016-11-031-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When set param failed, it will throw runtime exception and app will crash, but camera can stil work when set param failed. So catch exception when set param failed. Change-Id: Ie0bb7f453c8749068ce0c4b80b1e913e7191b714 CRs-Fixed: 1082632
* | | | | | Merge "SnapdragonCamera: Scene mode change" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-159-46/+45
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | SnapdragonCamera: Scene mode changeJack Yoo2016-11-099-46/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding Sharpshooter, Stillmore scene mode menu Moving Tracking focus to the scene mode Change-Id: I5afb2499e767d90f0e0e6408168961bcda4e55bb CRs-Fixed: 1083651
* | | | | | Merge "SnapdragonCamera: Continuous shot to YUV" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-157-144/+322
|\| | | | |
| * | | | | SnapdragonCamera: Continuous shot to YUVJack Yoo2016-11-097-144/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change continuous shot to YUV with ZSL Change-Id: If69d58456a17fa4181cf58f9660c0c6d033c4938 CRs-Fixed: 1083651
* | | | | | Merge "SnapdragonCamera: FR36364 Restore Defaults" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-155-0/+66
|\| | | | |