summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureUI.java
Commit message (Collapse)AuthorAgeFilesLines
* Snap: update shutter buttons on CaptureUIcodeworkx2018-01-271-14/+3
| | | | | | https://review.lineageos.org/#/c/200740/ Change-Id: I674de05dfb46fb714979ac66c16a85825af13c95
* Snap: Remove "help screen on first start" featureArne Coucheron2018-01-271-33/+0
| | | | | | | | | | | | | | | | | | | | Revert "SnapdragonCamera: Add help menu to camera2" This reverts commit 0dbfdffc9994a17e60c57b17c3cc5743cc75e155. Change-Id: Icb4e4bbc2b7883fa232483615a18d3197b2577bd Revert "SnapdragonCamera: Move help menu string to ressource" This reverts commit 901130273dbfc753ef883941a4e93b50056177e4. Change-Id: I82815ee7ef80985c88315c40d6b222f688fd6b75 Revert "SnapdragonCamera: Adding help screen on first start" This reverts commit 666692bf730a1c46210cc74781a56afb4b6fcf28. Change-Id: I8f2ee58c263537c3a02248aa344516f5321de13f
* Snapdragon: Add bokeh enable options in devzhuw2018-01-031-0/+35
| | | | | | | | | | add bokeh enable options in dev. value: true->enable false->disable blur->enter int value Change-Id: I4e69a5371b60ce55dee2468634b1e14956811f22 CRs-Fixed: 2164757
* SnapdragonCamera:support multi camera switchjunjiez2018-01-031-0/+1
| | | | | | | add a new option in dev options to swtich camera by camera Id. Change-Id: Ieeb6f462024c3b155dc5fb532fd737313b9904de
* SnapdragonCamera: Exit makeup when beautify value is 0Weijie Wang2017-06-191-2/+4
| | | | | | | Exit makeup when beautify value is 0 Change-Id: I342bbb6b4994b21d529fc14e3a76cc2b6d608ba7 CRs-Fixed: 2063105
* Merge "SnapdragonCamera: Selfie Mirror didn't work when 3rd-party app call" ↵Linux Build Service Account2017-06-021-12/+6
|\ | | | | | | into camera.lnx.3.0-dev
| * SnapdragonCamera: Selfie Mirror didn't work when 3rd-party app callweijiew2017-05-261-12/+6
| | | | | | | | | | | | | | RootCause: image is mirror twice when 3rd-party app call. Change-Id: I49cabbbc21983f2a18fa6d1416133d47fe60b34f CRs-Fixed: 2052668
* | SnapdragonCamera: Specify 10 as the minimum beauty valueweijiew2017-05-231-1/+1
|/ | | | | | | | It is unreasonable that the minimum beauty value is 0,specify 10 as the minimum beauty value Change-Id: I55b446245d372909dbfbf682006d93e9f252b438 CRs-Fixed: 2050968
* SnapdragonCamera: Smile/blink/gaze detectionjunjiez2017-03-141-2/+5
| | | | | | | | Implement Smile/blink/gaze detection feature and add option to enable it in develop options. CRs-Fixed: 1087487 Change-Id: I3005ca9767fbe38323e86255238cd4f96f34fbe5
* Merge "SnapdragonCamera:Fix Camera display a wrong label after recording ↵Linux Build Service Account2017-03-061-1/+2
|\ | | | | | | video." into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix Camera display a wrong label after recording video.pezhan2017-02-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | After recording video,the scene mode will use the last label. If switch to automatic mode,the scene mode label does't display, But if don't refresh label, next time after recording video ,will display last label in automatic mode. Need to refresh scene mode label when exit recording video mode. Change-Id: I87c0a8a0e64b6c622e0cfb658f164f8a59a20c4b CRs-Fixed: 2011981
* | SnapdragonCamera: fix filter menu showed in reviewjunjiez2017-02-201-0/+6
|/ | | | | | | | | | When camera is called by 3rd-party app and color filter menu is showed, the menu will not be closed after capture and preview is showed,add a judgement to close it. Change-Id: I79e254721a56abf190ce979fb84b62c08128498a CRs-Fixed: 2008844
* Merge "SnapdragonCamera:Fix Camera crash when taking picture with flash ↵Linux Build Service Account2017-02-161-8/+16
|\ | | | | | | light on." into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix Camera crash when taking picture with flash light on.pezhan2017-01-231-8/+16
| | | | | | | | | | | | | | | | | | | | If the CaptureModule is noraml mode ,the layout will not be inflated.If use it without check it's null, will cause force crash. Need to check if it's not the mormal mode,can use it safely. Change-Id: I4a8f1ddeaaf473e2fb99b418051bd54d6ebb9131 CRs-Fixed: 1114432
* | Merge "SnapdragonCamera:Fix The mode still on the viewfinder when taking a ↵Linux Build Service Account2017-02-161-0/+2
|\| | | | | | | video." into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix The mode still on the viewfinder when taking a video.pezhan2017-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | By default, the icon of mode is always display. When enter video mode,set the icon INVISIBLE ,when exit video mode,set it VISIBLE. Change-Id: Ifc8c8fb5f8e508387c553a15c57bdd93749038bb CRs-Fixed: 1109272
* | SnapdragonCamera:Fix photo reversed when enable selfie Mirrormingwax2017-01-191-1/+1
| | | | | | | | | | | | | | | | | | When camera is open front camer, and is in horizontal screen mode enable Selfie Mirror, set the image rotation angle of 180 degrees, to ensure the picture is right direction. CRs-Fixed: 1112749 Change-Id: I9b53804b7897f174c537693ff59db96df858e71d
* | Merge "SnapdragonCamera:Fix [FR35432] BestPicture function lost." into ↵Camera Software Integration2017-01-171-1/+14
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix [FR35432] BestPicture function lost.pezhan2017-01-111-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dialog when saving selected BestPicture. Add "X" icon display beside camcorder icon to exit BestPicture mode. Add multiple selections(Three dots beside SAVE)and "X" icon. Add dialog when select "X" icon. Add overflow menu with multiple selections to chose "Save All" or "Delete All" when click overflow menu. Add click for "Save All" to save all 1o pictures. Add click for "Delete All" to pop delete all dialog. Change-Id: I59cdad0f77fde616ea34db4d9d186d322285e394 CRs-Fixed: 1102814, 1102807, 1099428
* | SnapdragonCamera: Fix preview in wrong sizejunjiez2017-01-091-1/+4
|/ | | | | | | | | After setPreviewSize() is called, the size of the preview is not changed, need to invoke showSurfaceView to make it update. Change-Id: I67215bcce77c1016a0dfd66d100dcd251597af78 CRs-Fixed: 1105422
* SnapdragonCamera: add features for 3rd-party appsjunjiez2016-12-271-6/+153
| | | | | | | Add capture and recording features for 3rd-party app. Change-Id: Iefedbed2cb17cca17941e70f861448a2b8f97da2 CRs-Fixed: 1095457
* Merge "SnapdragonCamera: Dialog display incompletely in landscape mode" into ↵Camera Software Integration2016-12-221-7/+8
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Dialog display incompletely in landscape modeweijiew2016-12-151-7/+8
| | | | | | | | | | | | | | Create a new layout for landscape mode CRs-Fixed: 1099373 Change-Id: Ie505c6ef8795e0b8a8b3424afde7cb46fc368136
* | Merge "SnapdragonCamera: The "x" of the scene mark is too large" into ↵Camera Software Integration2016-12-201-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: The "x" of the scene mark is too largeweijiew2016-12-141-1/+1
| |/ | | | | | | | | | | | | Change the "x" of the scene mark to a small size. CRs-Fixed: 1101206 Change-Id: I7f64cd2b68ba30881309e7e5cb3a013e9168661a
* | 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
* / SnapdragonCamera: Fix FC caused by mSession Nullqimengp2016-12-131-3/+5
|/ | | | | | | | | | | | 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: 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-131-3/+164
|\| | | | | | | mode" into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Show label and dialog when switch to new scene modeweijiew2016-12-051-3/+164
| | | | | | | | | | | | | | Show label and instructional dialog when switch to new scene mode Change-Id: I75becaa9bb898ca9ef68c94b1195069131745f14 CRs-Fixed: 1091210
* | SnapdragonCamera:Modify Camera2 VideoRecording UIjunjiez2016-12-051-14/+17
|/ | | | | | | | Modify Camera2 VideoRecording UI and make it look like the same as the design document shows. Change-Id: I41ea3db7312847fe56ad9d8e73dfa92b030e79e2 CRs-Fixed: 1093507
* Merge "SnapdragonCamera: Disable color effects when scene mode is ↵Camera Software Integration2016-12-011-0/+16
|\ | | | | | | non-automatic" into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Disable color effects when scene mode is non-automaticweijiew2016-11-241-0/+16
| | | | | | | | | | | | | | | | 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:Modify beautify interface" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-011-2/+24
|\ \
| * | SnapdragonCamera:Modify beautify interfacejunjiez2016-11-151-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Camera2 FC click video btn for many times" into ↵Camera Software Integration2016-11-281-0/+4
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix Camera2 FC click video btn for many timesmingwax2016-11-181-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Shutter button was disabled after switching to ↵Camera Software Integration2016-11-281-0/+9
|\ \ \ | | | | | | | | | | | | video mode" into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Shutter button was disabled after switching to video modeweijiew2016-11-171-0/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Improve onResume" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-281-0/+1
|\ \ \
| * | | SnapdragonCamera: Improve onResumeJay Wang2016-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-281-0/+14
|\| | | | |/ / |/| |
| * | SnapdragonCamera: Add ProModeByunghun Jeon2016-11-141-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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 camera can`t enter setting in pattern lock" ↵Camera Software Integration2016-11-151-0/+1
|\ \ \ | |/ / |/| | | | | into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix camera can`t enter setting in pattern lockmingwax2016-11-101-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | SnapdragonCamera: Scene mode changeJack Yoo2016-11-091-8/+4
| | | | | | | | | | | | | | | | Adding Sharpshooter, Stillmore scene mode menu Moving Tracking focus to the scene mode Change-Id: I5afb2499e767d90f0e0e6408168961bcda4e55bb CRs-Fixed: 1083651
* | SnapdragonCamera: Continuous shot to YUVJack Yoo2016-11-091-0/+1
| | | | | | | | | | | | | | Change continuous shot to YUV with ZSL Change-Id: If69d58456a17fa4181cf58f9660c0c6d033c4938 CRs-Fixed: 1083651
* | 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