summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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
|\| | | | |
| * | | | | SnapdragonCamera: FR36364 Restore Defaultsweijiew2016-11-075-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore all of the camera settings to defaults Change-Id: Icebc84a165a1fabee2075daa9b4e99695204cc19 CRs-Fixed: 1084321
* | | | | | Merge "SnapdragonCamera: Update preview UI when recording rest time was ↵Camera Software Integration2016-11-151-1/+21
|\| | | | | | | | | | | | | | | | | | | | | | | zero" into camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Update preview UI when recording rest time was zeroweijiew2016-11-071-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update preview UI when the recording rest time was zero Change-Id: I538cac957a6c467974e0381ee6cab34dee7fdcfd CRs-Fixed: 1085359
* | | | | | Merge "SnapdragonCamera: Color Filter menu incorrectly displayed" into ↵Camera Software Integration2016-11-151-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Color Filter menu incorrectly displayedweijiew2016-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Color filter menu doesn't dismiss when switch camera Change-Id: I305a38a8f3b891ed34aff9ee739035c04a5930a9 CRs-Fixed: 1084775
* | | | | | Merge "SnapdragonCamera: Settings display incomplete when set font size as ↵Camera Software Integration2016-11-151-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | largest" into camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Settings display incomplete when set font size as largestweijiew2016-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting item's height was limited to 50dp. The text can't be display incomplete when font size was set to largest.so,set height as wrap_content with minWidth 50dp instead of 50dp Change-Id: Ib7a778396b644e25ef0ef304e02dd0ce95b3a835 CRs-Fixed: 1085881
* | | | | | Merge "SnapdragonCamera: Remove QCIF from supported resolution list" into ↵Camera Software Integration2016-11-152-10/+0
|\| | | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Remove QCIF from supported resolution listweijiew2016-11-072-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove QCIF from supported resolution list for Video and Photo Change-Id: If607c7f816cc914c2515b9b75b8660c225b074b0 CRs-Fixed: 1061470
* | | | | | Merge "SnapdragonCamera: Add face detection for camera2 video record" into ↵Camera Software Integration2016-11-151-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Add face detection for camera2 video recordRanjith Kagathi Ananda2016-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable face detection for video recording as well CRs-Fixed: 1084703 Change-Id: Icbd80f10c1af70e6aa8a1dcbdede1b331086eae3
* | | | | | Merge "SnapdragonCamera: update face view for video recording use-case" into ↵Camera Software Integration2016-11-151-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: update face view for video recording use-caseJay Wang2016-11-071-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update face view for video recording use-case Change-Id: Id8ed2053e0a850d0bbf5666abf03c0ab605af2e9 CRs-Fixed: 1084703
* | | | | | Merge "SnapdragonCamera: Reading persist system property only once" into ↵Camera Software Integration2016-11-151-10/+21
|\| | | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Reading persist system property only onceJay Wang2016-11-071-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reading persist system property only once Change-Id: I62296c3eb508ad0e9b34eaa1bf815ef08c129250 CRs-Fixed: 1077021
* | | | | | Merge "SnapdragonCamera: Adjust video encoder bit rate and add 60fps ↵Camera Software Integration2016-11-154-59/+137
|\| | | | | | | | | | | | | | | | | | | | | | | support" into camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Adjust video encoder bit rate and add 60fps supportJay Wang2016-11-074-59/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Configure the video encoder bit rate to the recommended value - Add 60fps video frame rate support Change-Id: I477487c4c4fab5479534896d90e08c3eadddc54f CRs-Fixed: 1074187
* | | | | | Merge "SnapdragonCamera: run-time updates the video encoder list" into ↵Camera Software Integration2016-11-155-177/+166
|\| | | | | | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: run-time updates the video encoder listJay Wang2016-11-075-177/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the supported video encoder list based on video resolution. In addition, re-factor the run-time filtering of HFR list to follow the same approach. Finally, simplify the beautification dependency handling logic by fixing the supported video resolution to 720x480. CRs-Fixed: 1081552 Change-Id: I32b96f7ccf152ddf01400e9564e072e1bf1b68d1
* | | | | | Merge "SnapdragonCamera: Fix torch mode with continuous shot" into ↵Camera Software Integration2016-11-151-9/+38
|\| | | | | | |_|_|_|/ |/| | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Fix torch mode with continuous shotJay Wang2016-11-071-9/+38
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flash torch mode sometime doesn't work because the flash mode is overwritten by repeating preview request. To resolve the issue, re-configure the preview request with new flash mode. CRs-Fixed: 1077543 Change-Id: I614bac704562925cc843a9b8db2852c71368f4e5
* | | | Merge "SnapdragonCamera: Fix FC when tap flash button continously" into ↵Camera Software Integration2016-11-101-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Fix FC when tap flash button continouslymingwax2016-11-021-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When user tap flash button continously, camera session occur error, and throw IllegalStateException. Because session has been closed, further changes are illegal. Solution, use try/catch to capture the IllegalStateException. Change-Id: Ib2349673e1ab34b9a897e3e7c96cfa6c7744b80c CRs-Fixed: 1084774
* | | | Merge "SnapdragonCamera: Fix press volume key can`t take picture" into ↵Camera Software Integration2016-11-101-0/+35
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Fix press volume key can`t take picturemingwax2016-11-011-0/+35
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Did not implement the code. Add code in onKeyDown and onKeyUp method refer to PhotoModule.java. Add the listening which the user press the volume key down or up. Change-Id: I5380d3fcad146fccadf7d1657c4e2e79f218f75e CRs-Fixed: 1084315