summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Camera: Add support for UbiFocus, ChromaFlash and OptiZoom.Ajit Singh Solanki2013-12-136-1/+138
| | | | | | | | | - Add UI option in App to enable/disable UbiFocus, ChromaFlash and OptiZoom - App shows UI options for these features only when supported in HAL Change-Id: I924f97b2b510b351d9a8cb48a0aac6a4dc24ca10
* Merge "Camera: Fix instability during ZSL snapshot"Linux Build Service Account2013-11-232-4/+13
|\
| * Camera: Fix instability during ZSL snapshotEmilian Peev2013-11-172-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AF(for instance touch AF) could be started during ZSL mode. Currently the application will not wait for AF callback to come before proceeding with the snapshot. This depending on timing will lead to inconsistent camera application state where an AF callback could arrive during image capture and override the current state machine allowing the client to trigger capture again. The second capture will fail causing an exception. - This patch will not let the camera application trigger snapshot when AF is still running during ZSL. Additionally it will unlock CAF after capture is done through a call to 'cancelAutoFocus()'. Change-Id: Id5ae8ff0b7c1576ac7c6221f09837929aefcea17 CRs-Fixed: 572996, 564453
* | Merge "Update face detection start state based on zsl or normal mode."Linux Build Service Account2013-11-221-1/+3
|\ \
| * | Update face detection start state based on zsl or normal mode.Santhosh Kumar H E2013-11-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While capturing image state of face detection start variable was set to false. This is because in normal capture mode, preview will be restarted after image capture during which face detection will be started again. In case of zsl mode, variable state was set to false though preview is not restarted. So when user uncheck face detection option, control was returning without clearing face data. This check makes sure the state is updated only in non ZSL mode. Change-Id: I66ad64d17011a25f0d02e77334392f5d3b0abd77 CRs-Fixed: 566252
* | | Merge "Update preview as per aspect ratio on back key press."Linux Build Service Account2013-11-225-2/+11
|\ \ \
| * | | Update preview as per aspect ratio on back key press.Santhosh Kumar H E2013-11-125-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user is not in full screen camera preview mode, pressing back key will take user to full screen preview mode. During this all views on filstrip are reloaded and shifted to full screen preview. While reloading preview aspect ratio was not considered so user could see stretch preview in case of front camera. This change calls resize of preview as per aspect ratio after reload. Change-Id: I3dc8db3cc9917f9db33f5101f6c39cf38b950264 CRs-Fixed: 568855
* | | | Merge "Update storage hint when switched back to full screen preview."Linux Build Service Account2013-11-221-0/+14
|\ \ \ \
| * | | | Update storage hint when switched back to full screen preview.Santhosh Kumar H E2013-11-181-0/+14
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user swipe right and delete some images to empty space. Or pause the activity, delete some data to free up memory also the storage hint was not getting dismissed. Because avaiable storage space was not checked in all these cases. This change makes sure the storage availability is checked and UI is being updated. Change-Id: I29a0471d596945ae370b21a61e3ad1f995dced25 CRs-Fixed: 573549
* | | | Merge "Remove duplicate settings."Linux Build Service Account2013-11-211-68/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove duplicate settings.Santhosh Kumar H E2013-11-211-68/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the settings options are repeated because they were added along with new features and base camera application also has those settings. So removed duplicate settings as per the requirement. Base camera settings are removed to maintain uniformity with other settings added and its as per the expectation of internal test team also. Change-Id: Ic609540e9e372ad3bef0e634012821b3cb1a12c5 CRs-Fixed: 569673, 575211
* | | Merge "Consider layout width for pie menu arc radius"Linux Build Service Account2013-11-191-1/+8
|\ \ \
| * | | Consider layout width for pie menu arc radiusSanthosh Kumar H E2013-11-141-1/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pie renderer arc radius was always constant and read from resource dimensions, irrespective of the screen width. Hence when there are more options, some of the options were getting rendered beyond the screen. In this code the value from dimensions is saved to a separate variable. During each layout change maximum value which can be rendered is set as arc radius. Change-Id: I893685d0e57c839ccbb96826c01208fa581fa7cc CRs-Fixed: 568052
* | | Merge "Camera2:Fix crash on launch of camera after deleting camera folder."Linux Build Service Account2013-11-191-2/+4
|\ \ \
| * | | Camera2:Fix crash on launch of camera after deleting camera folder.Vasantha Balla2013-11-141-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If video starts playing from camera and suddenly camera folder is deleted from gallery, then crash is seen while launching camera. - Film strip reload is not getting called for this case and trying to access old data from data adapter which is null.Added reload function if only camera preview is present and no other camera data. CRs-Fixed: 567569 Change-Id: I9c6c7ebe63c553ccc68b985e00fa0ca722d77157
* | | Merge "Camera: Checking for null before creating bitmap"Linux Build Service Account2013-11-191-1/+1
|\ \ \
| * | | Camera: Checking for null before creating bitmapRaghu DP2013-11-121-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | We dont get bitmap data when image is captured in raw format. So downsample of the captured image, which is bitmap will be null. Added null check for bitmap before calling createBitmap function. Change-Id: I9261218bbb27a9a7671f62fec72885eed1376912 CRs-Fixed: 573544
* | | Merge "Delay clearing face data while stopping face detection."Linux Build Service Account2013-11-191-1/+6
|\ \ \
| * | | Delay clearing face data while stopping face detection.Santhosh Kumar H E2013-11-111-1/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of zsl mode face detection last callback is received in 40 to 50ms after calling stop face detection on camera device. This may be because of multi channel operation in zsl. Because of this behavior though camera application clears the UI immediately after stop face detection, invalid circles remain on screen. This fix delays clearing of face circles by 100ms. Change-Id: I1ca10e82fff038ba720910a4cf022876dca050e1 Crs-Fixed: 566252
* | | Merge "Add camera button intent receiver."Linux Build Service Account2013-11-191-0/+5
|\ \ \
| * | | Add camera button intent receiver.Santhosh Kumar H E2013-11-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera button broadcast receiver registration was missing in manifest file of Camera application. So camera hardware button long click was not launching camera application. This change registers the broadcast receiver in Android manifest file. Change-Id: I53e6f7029fbe24c303b500487a54edb10e2b8ac9 CRs-Fixed: 574354
* | | | Merge "Reset scene mode to Auto in camcoder and panorama modes."Linux Build Service Account2013-11-192-0/+14
|\| | |
| * | | Reset scene mode to Auto in camcoder and panorama modes.Santhosh Kumar H E2013-11-122-0/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camcoder and panorama does not support scene modes. In the error case user has set scene mode to a value other than Auto in image camera mode. During initialization of video module camera parameters are obtained from AndroidCameraManagerImpl. Which maintains the local camera parameters object to avoid calling framework each time. The local parameter variable was set with a scene mode in image camera and hence it gets reflected in video module as well. This change will reset the scene mode to auto each time video or panorama modules are initialized. Change-Id: I3d620a9d163d4042cf8c09ed3c6ae8ee8ef2dc93 CRs-Fixed: 573573
* | | Merge "Panorama: Restart take picture call after layout changes."Linux Build Service Account2013-11-191-0/+15
|\ \ \ | |_|/ |/| |
| * | Panorama: Restart take picture call after layout changes.Santhosh Kumar H E2013-11-151-0/+15
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In reverse landscape and reverse portrait panorama modes, layout change callback is received when shutter key is pressed for the first time. It looks like the layout change call is because of navigation panel getting rendered on top of the screen. Due to this camera application resets the preview window dimensions and changes the status from capture to view finder. This change restart the start picture call after layout changes. Its done through hanlder because reset configMosaicPreview() posts a message to reset on a handler. Change-Id: Ic42a6929198eff52d659468f1df7170bdbdf6a38 CRs-Fixed: 573570
* | Merge "Do not enable filmstrip swipe during recording."Linux Build Service Account2013-11-131-1/+1
|\ \
| * | Do not enable filmstrip swipe during recording.Santhosh Kumar H E2013-11-121-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | When user initiates zoom UI during recording, hide call was made on pie menu. Pie menu hide enables swipe. Hence if user does zoom while recording swiping was getting enabled. During recording pie menu will be hidden so do not call pie menu hide during recording. Change-Id: Ic92759090f36dab55d0f80fa5cf52446cee15cc9 CRs-Fixed: 564670
* | Merge "Clear preview frame during activity pause in full screen camera mode."Linux Build Service Account2013-11-132-0/+18
|\ \
| * | Clear preview frame during activity pause in full screen camera mode.Santhosh Kumar H E2013-11-122-0/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CameraActivity Reloads views on filmstrip during resume (If the CameraActivity go to pause state when user is in full screen camera mode). While reloading surface texture is destroyed and recreated. So when user press power key to pause and unlock to resume, till the surface texture is destroyed user see the old frame (which was rendered before onPause). Followed by gray screen till surface creation and start of preview. It created filckering impact on UI. Fix here is to destroy the surfaceTexure in onPause itself so during next resume user won't see old frame. Change-Id: I035671cfa61dcfefe7a6392a316fae6739e81247 CRs-Fixed: 566255
* | Merge "Camera: Reseting Metering ROI after snapshot."Linux Build Service Account2013-11-131-0/+3
|\ \ | |/ |/|
| * Camera: Reseting Metering ROI after snapshot.Raghu DP2013-11-131-0/+3
|/ | | | | | | | After taking snapshot focus ROI were not reseting. This change will help to reset the ROI. Change-Id: Ie1269faadde7829bd11c39dd8a56188bbe2ee479 CRs-Fixed: 566265
* Merge "Revert "Clear preview frame on surfaceTexture during activity pause.""Linux Build Service Account2013-11-082-16/+0
|\
| * Revert "Clear preview frame on surfaceTexture during activity pause."Shruthi Krishna2013-11-082-16/+0
| | | | | | | | | | | | This reverts commit 9930c01a3859dd103851f772801c0fdfaf727921 Change-Id: I0339d52e6a8718dd2029fc4689299e451c7944be
* | Merge "Camera2: Fix crash in Camera during edit operation on double tap."Linux Build Service Account2013-11-081-5/+10
|\ \ | |/ |/|
| * Camera2: Fix crash in Camera during edit operation on double tap.Vasantha Balla2013-11-071-5/+10
| | | | | | | | | | | | | | | | | | | | | | - Multiple NullPointer Exceptions are seen on double tap of Edit button in camera app.Two instances of FilterShowActivity are created on double tap which is causing crash in Camera. - Need to avoid creation of second FilterShowActivity on double tap. only one instance of edit activity will be shown at a time. CRs-Fixed: 565599 Change-Id: I0e7304b7b4ba0592651f7c47b5f752d830643f33
* | Merge "Camera2: Adds support for longshot/burst mode"Linux Build Service Account2013-11-079-8/+196
|\ \
| * | Camera2: Adds support for longshot/burst modeAlok Kediya2013-11-079-8/+196
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The longshot/burst pipeline mode uses an optimized path for triggering 'takePicture()' on each shutter callback. This should improve the shot-2-shot time. In addition to this there is also support for jpeg callbacks that only contain a jpeg file path. The callback in this case will only move the file stored by the lower layers in the correct directory. - The longshot burst pipeline can be enabled via this property: "persist.camera.longshot.enable"<-"0/1" - This change will allow longshot mode to be triggered in non-zsl mode as well. (Cherry picked from: I693366a7d06d3b386a8d96f86ee9a0574749c50b) (Cherry picked from: Id630b2033f18d1c04a636597e910e695a8692ac8) Change-Id: Idda8d58fc6d889128c1812c9c5ddadca3993c246
* | Merge "Clear preview frame on surfaceTexture during activity pause."Linux Build Service Account2013-11-072-0/+16
|\ \ | |/ |/|
| * Clear preview frame on surfaceTexture during activity pause.Suman Mukherjee2013-11-062-0/+16
|/ | | | | | | | | | | | | | CameraActivity Reloads views on filmstrip during each resume. While reloading surface texture is destroyed and recreated. So when user press power key to pause and unlock to resume, till the surface texture is destroyed user see the old frame (which was rendered before onPause). Followed by gray screen till surface creation and start of preview. It created filckering impact on UI. Fix here is to destroy the surfaceTexure in onPause itself so during next resume user won't see old frame. Change-Id: Id5c787586288de660dc6ad91f3c2ae018761ddd4 CRs-Fixed: 566255
* Remove unnecessary files.Satish Kamuju2013-11-012-0/+0
| | | | | | Cleaned up swap files from this project. Change-Id: I056e69c20f97208b5c4be27c9f8bbb157e408278
* Camera2: Fix compilation issuesManish Kumar2013-10-317-73/+131
| | | | | | | | Fix compilation issues Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21 (cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4) (cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)
* Camera: Synchronising video functionality of errant usecase.Ashok Raj Deenadayalan2013-10-311-1/+46
| | | | | | | | | | | | | | | | | | When user switches to VideoModule and executes the capture, stops it immediately, after several such attempts the media recorder enters into illegal state, in such situation, if user still continues the same behaviour, app will be flooded with the onShutter events which will lead to ANR, and further similar trials will lead to crash. Here, we are synchronizing the behaviour(user events)by checking the entry/exit body of majorly hit functions so that app will not be flooded with user events. (cherrypicked from: I3e7768211855a31f1c573d0ed89abb5c6216cb1b) Change-Id: Ia65f39c24822ae09694b8247fa58ffb1770e74da CRs-fixed: 534762 (cherry picked from commit 615b8451f787aa8e34834847301fd151d7eb66d6) (cherry picked from commit cf6dfaf3aa65b46b74f3e54236b24638ad1249de)
* Set params to camera in active preview on orientation change..Ashok Raj Deenadayalan2013-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | --On a race condition same surface texture is getting used in startPreview and onOrientationChanged by Handler Thread and CameraThread. Synchronised Lock object is going to wait state and that caused ANR. --Set orientation related parameters only in preview state (cherrypicked from: I8d149e839872c06efa696a10fa3ac19618791f41) Change-Id: Id2be51f58315d2d2effe62e22955b203187e5fd7 CRs-Fixed: 538723 Conflicts: src/com/android/camera/VideoModule.java Conflicts: src/com/android/camera/VideoModule.java (cherry picked from commit 194f1aea7d6f88de55d54b750c3be4c6957e0820) (cherry picked from commit 042c6222edf077251e3b0ef52a23d3b433bc804d)
* CameraApp: Updating the view for new list item preferenceAshok Raj Deenadayalan2013-10-311-5/+6
| | | | | | | | | | | | | | | | | | | | | User has launched the popup menu view in portait mode and can see all the list items in a single view. When user turns the device to landscape mode, the popup view will be shown partially, thus user has to scroll the popup menu to see remaining list items. When user scroll's over the view, if the view is not updated/ initialized with the new list item, it will render the old indexed item(s), thus user will see the repeatation of old items. This fix will update the view by initializing the item preference from the adapter and returns the updated view based on new position. CRs-fixed: 524897 (cherrypicked from: I9ae25f0a711bc641fa405e85292db2c1af95e8a1) Change-Id: I7cc63c9e01a69b6c439102a93f964013f1e15374 (cherry picked from commit d69c568eb8bf9a9a5cce6c9402617f9e6f3072a8) (cherry picked from commit 3851a9b18310580ef9f6ccecdfb1c3ca08a6c719)
* Camera: Disable skin tone bar during switch camera...SanthoshHE2013-10-311-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 08dcf9cda27328dffab9921b42cb13b6f8d5a770 Reverted the above commit because updating skintone seek bar all the time caused issues during regression. The original issue is fixed in a way that skin tone bar is dismissed in switch camera function (where other UI controls are dismissed). Hence after opening new camera device depending on the scene mode setting, skin tone bar visibility will be set for the new camera. (cherry picked from commit I61602dca23c59b6715d1e887d0199d8885330521) Change-Id: If7a37b9dbb3d379f079e88ecf8e930ad1f7b82ab CRs-Fixed: 537663 Conflicts: src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoModule.java (cherry picked from commit 63f9d74c3abe9d0a9c5cba877665c3349554c024) (cherry picked from commit 1640e0c12135b0b2a0b7b2440d8eaeb7f5ffe8c8)
* Camera: Configure skin tone in main handler thread..Santhosh Kumar H E2013-10-312-28/+22
| | | | | | | | | | | | | | | | | | - A "ConcurrentModificationException" is possibleduring concurrent configuration of camera parameterswhen skin tone is updated. To avoid this skin tone is applied through the main handler. (cherry picked from commit I2176e615432b1a25ff439b3f105ea9e498ae8803) Change-Id: If20c34dc70fbf6fa3fc9ddfefadd71bc9db2cffb Conflicts: src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoModule.java (cherry picked from commit 37c435a3b61b435ab677cc013af02c8b48d76dc9) (cherry picked from commit 5341b096004fa59d9732651fe03ffc161bc61156)
* Bring skin tone seekbar to front...Santhosh Kumar H E2013-10-312-3/+48
| | | | | | | | | | | | | | | | | | | Skin tone dialog was part of frame layout and render overlay was drawn on top of this. So render overlay was consuming all touch events. This change makes sure skin tone dialog receive touch events whenever it is visible. Change-Id: I1d01bcc101c2f9090f0f163397e86553f98b49ac Conflicts: res/layout/photo_module.xml src/com/android/camera/PhotoModule.java Conflicts: res/layout/photo_module.xml src/com/android/camera/PhotoModule.java (cherry picked from commit 675a15daf9b9eef543386630dc65f3fa9dac498e) (cherry picked from commit ac2d0ab2b068576bf1adf05e4cef96aaf4c14be3)
* Bring count down timer UI to front.Santhosh Kumar H E2013-10-311-0/+1
| | | | | | | | | After inflating count down timer UI it was not visible on top of the preview. This fix will bring it to forground. Change-Id: I3fd5cf75fdd9dc63776fa68668f3b6fddf2db1f7 (cherry picked from commit 48226bb2faf6377a5af91db82ffb86848a7600bf) (cherry picked from commit c88dcd24d06a3af1de4ec18914fbb03a5678bff2)
* Camera: Fix for stretched preview in camera and camcorder...Santhosh Kumar H E2013-10-316-44/+167
| | | | | | | | | | | | | | | | | | | | Stretched preview is observed in front camera due to sensor's mount angle. So resizing the preview by considering aspect ratio of the preview. (cherry picked from commit Ie8a9e062782aa6caaa80ddab705c937da6b0761e) Change-Id: I0bca9076a6dffa4c4972e6d5d0939c57569615bd Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java (cherry picked from commit 2960ef94825458dc07a497d4414155b57ae620d7) (cherry picked from commit d2fbed622a486151a656261d0dd56c896f0cc700)
* Camera : Fix null preference string for scene mode and fd.Sai Kumar Sanagavarapu2013-10-311-4/+4
| | | | | | | | | | Null pointer exception in app is observed when the preference string for scene mode is dereferenced.for YUV Sensor, preference setting for scene mode is NULL as its not applicable for YUV sensor. Change-Id: Icc04e9b21641b1cc3ca7e183a23667be151b5a65 (cherry picked from commit 56dd2afdd7ad89e85d06450175538dbd3f075e8c) (cherry picked from commit 040389fdf54389745b19a61f40732f54a8ce7344)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 11:32:20 +0000