summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoUI.java
Commit message (Collapse)AuthorAgeFilesLines
* Drop new focus indicator into Camera2.Paul Rohde2016-01-151-44/+5
| | | | | | | * Create a new custom focus view that interacts with physical lens diopter changes. * Replace all occurances of the old focus indicator with the new one. Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
* SnapdragonCamera: Fixing NullPointerException in onCreate of VideoModuleSanjeev Garg2016-01-141-0/+3
| | | | | | | | | | As per new open camera optimization, setContentView is called after init. But VideoModule has a dependency in initialization on setContentView as if setContentView is not called before using mFilmStripView then its value is null. To avoid this changed the location of using mFilmStripView from initialization to onResume. Change-Id: I6f0116fa82554b11b06d733b3952e6596daa50d3
* SnapdragonCamera: Hide the preview cover when preview has startedlikaid2016-01-081-3/+7
| | | | | | | | | | | The preview cover was shown when onPause, but didn't hide after resume. That caused the video preview turned to black screen. After the camera preview starts, hide the preview cover if it is still showing. Change-Id: I79fdcd45d46d7c083a132e864bbf42649b100ae4 CRs-Fixed: 865933
* camera: Touch focus support for camcorderSteve Kondik2015-09-201-1/+54
| | | | | | | | | * Available when video snapshots are not supported. * Original from CodeAurora Forum. Sultanxda: Adapted to Snapdragon Camera Change-Id: I232c178430db08e7366aa9f91b4926d07e7c225d
* Snap: Fix NPE when switching video effects and click on screenjumoog2015-09-191-2/+5
| | | | * Check if mMenuLayout is null, like in 23901e48 for PhotoUI
* Camera2: tweak volume key zoom and cleanupLars Greiss2015-09-171-10/+1
| | | | | | | | | - cleanup unused code - cleanup codestyle - add more zoom steps for smother zooming - show zoom circle indicator during zoom Change-Id: I5214fc2620a0c5167bfdc8e85f7115966c3b8bcf
* Camera2: implement volume key zoom in video modejt11342015-09-171-0/+16
| | | | Change-Id: I140e8cfb3e39700f60e40c35b38e92c83a3c26de
* Camera2: implement exposure compensation settings in video modejt11342015-09-171-0/+2
| | | | Change-Id: I83a2675e109dc7924cdd9240b26051ac218f532a
* Camera: fix preview for landscape devicesPawit Pornkitprasan2015-09-171-6/+2
| | | | | | | | | | Landscape devices have broken preview because PORTRAIT mode is being abused to check for screen rotation. Use proper rotation check to fix. Ported from cm-10.2 Change-Id: I75588cbce9843e180e4be7591f6a43bcec788506
* SnapdragonCamera: Initialize overlay before control-by-intentSultanxda2015-09-171-1/+1
| | | | | | | | * initializeControlByIntent() expects mVideoMenu to not be null and initializeOverlay() initializes mVideoMenu when it isn't null * Change the order the functions are called to prevent possible NPE Change-Id: I6d240892f3bd318031983243760d87ab46b25edb
* Merge fa458f0a64a6b4412912c9177ec0fbeed084a28f on remote branchLinux Build Service Account2015-08-061-97/+71
|\ | | | | | | Change-Id: Ib0ecc314a7bd0b76c8e955402d9adfe0a4989223
| * SnapdragonCamera: remove nav bar to enable full screen previewByunghun Jeon2015-08-031-97/+71
| | | | | | | | | | | | | | Remove the navigation bar in order to take advantage of full screen. Change-Id: I25f42af825c4f3b7ad6521c2ee6d62fa4219044a CRs-Fixed: 865254
* | SnapdragonCamera: Fix Zoom orientationByunghun Jeon2015-06-241-0/+3
|/ | | | | | Fix Zoom UI's orientation Change-Id: I9c14b08729e099c263d612289ccb8b7ed757168b
* SnapdragonCamera: Popup menu doesn't support RTL modelikaid2015-04-111-2/+5
| | | | | | | | | Coordinate direction is opposite in RTL mode. Modify Coordinate direction in RTL mode. Change-Id: I3fcd42fc27d430b486f9cccdde5ecec0d0468d30 CRs-Fixed: 819310
* SnapdragonCamera: Fix settings menu layout dirction fromlikaid2015-03-061-10/+23
| | | | | | | | | right to left in RTL mode. Use gravity of RIGHT instead of LEFT in RTL mode. Change-Id: I879fd0351c447b35a5dac7fe14e1698b08883583 CRs-Fixed: 801704
* Snapdragon: Fix photo/video preview to match with captured photo/videoByunghun Jeon2015-02-201-62/+96
| | | | | | | | Photo and video preview and the captured results are different for some resolutions. Fix them to match the result. Change-Id: Ie5fb1954448fa54ffb968f2882e74bfd98c97548 CRs-Fixed: 791082
* SnapdragonCamera: circular thumbnail iconLikai Ding2015-02-171-24/+6
| | | | | | | | | | 1. change thumbnail icon to circular and its background to transparent 2. speed up loading with optimal sample size and region decoder 3. fix orientation bug regarding panorama photos 4. don't fire load task on fake onDataLoaded() call Change-Id: I7f4eb8dad4c54a01a7ccd98907e06952e470840b (cherry picked from commit ac714ea974b4bd0ef99403def5aa7d8a3deecc5d)
* Merge "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"Linux Build Service Account2015-02-101-1/+1
|\
| * SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | Changed the Panoramic preview to full screen Resized the warped preview image to smaller Size and render on top of the full screen preview image Warped preview image can be turned on/off Change-Id: I859839542ce94c5f70d7fe7983e93b5e9534b415
* | Merge "SnapdragonCamera: Improve app stop latency"Linux Build Service Account2015-02-061-0/+5
|\ \ | |/ |/|
| * SnapdragonCamera: Improve app stop latencyShalaj Jain2014-12-091-0/+5
| | | | | | | | | | | | | | | | | | Disable shutter button before starting/stopping recording on a shutter button click and enable it after without any delay. Add logs to know when shutter button is disabled/enabled. Change-Id: Ibca1e964d2e2fc1c1bd47c104f87289eb2a507bf
* | SnapdragonCamera: fix portrait orientationLikai Ding2015-02-021-9/+67
| | | | | | | | | | | | | | | | | | | | | | | | Fix camera activity to portrait, so there is no delay when rotation occurs. Main changes are: 1. RotateLayout now supports padding and dynamically added child. 2. Camera controls and gesture detetion are now orientation-aware. 3. Toasts are replaced with RotateTextToast. 4. Obselete layout files are removed. Change-Id: I338849bd7fb84b847eb357f771a24a5cc09bf6fa
* | SnapdragonCamera: support 4:3 preview on 16:9 screenLikai Ding2015-01-081-0/+13
| | | | | | | | | | | | | | | | When preview is set to 4:3 on a 16:9 screen, resize SurfaceView to 4:3 and cover other parts of the screen. Otherwise camera controls have a semi-transparent background. Change-Id: Icfbe6318b6a9de9a988468078b474e842f6ddd8c
* | SnapdragonCamera: fix app crash when switch to camcorderkaiyiz2014-12-161-0/+6
|/ | | | | | | | | | Camera app crash when switch to camcorder during continuously shooting. Prohibition click event when continuously shooting. CRs-Fixed: 744811 Change-Id: Ia51ca53d46e060c2a4f4e877c37f795526532be7
* SnapdragonCamera: Add back missing setting menusByunghun Jeon2014-11-191-23/+28
| | | | | | Adding back missing setting menus Change-Id: I803d3f694b1953aa6a8932cbba6bb55c0d0e6352
* SnapdragonCamera: Add preview thumbnail buttonByunghun Jeon2014-11-191-3/+22
| | | | | | Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
* SnapdragonCamera: Use MDP composition instead of GPUByunghun Jeon2014-11-171-99/+97
| | | | | | Use MDP composition instead of GPU Change-Id: I4f47d26365bd611242a21e66b232d7521b502b04
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-171-14/+176
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* Camera2: fix sawtooth in camera previewLikai Ding2014-10-151-8/+4
| | | | | | | | | | Under certain combination of preview/screen resolution, sawtooth is seen on preview image. In setTransformMatrix(), scaledTextureWidth/Height is unnecessarily rounded to integers, losing precision. Removing the rounding fixes the problem. CRs-Fixed: 705322 Change-Id: Ia78b012cf530528b3677a8684279862a81b145ed
* SnapdragonCamera: Add support for CDS and TNR settingsDimitar Borisov2014-09-301-1/+3
| | | | | | | | | | | | | Add support for CDS and TNR settings - CDS and TNR can be controlled in photo mode and video mode. - CDS is set to off and cannot be set to other value when TNR is enabled - CDS value is restored when TNR is disabled again CRs-Fixed: 715042 Change-Id: Idf08403e38d0e3e634b047a955f2328b4237e691
* SnapdragonCamera: Switch to SD card when internal storage is fullkaiyiz2014-08-211-0/+4
| | | | | | | | | | | | | | | | When internal storage is full, switch to SD card for storage. Change the save path from internal storage to SD card when updateStorageSpace is called if: 1. Internal storage is the current save path and does not have enough space 2. SD card has enough space Display a toast message and update display of the save path menu item when the storage path is switched. CRs-Fixed: 687210 Change-Id: I6a9804e4f64e6d55c6aebd889ac2ce5e887cfa5a
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-161-1/+1
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* Merge "Camera2: remove the pause button when timelapse is on"Linux Build Service Account2014-04-111-1/+3
|\
| * Camera2: remove the pause button when timelapse is onKerong Sui2014-04-081-1/+3
| | | | | | | | | | | | | | | | Camcorder will crash when pause and continu in timelapse mode.remove this feature for timelapse mode. Change-Id: Ia81a11c7879286aafec0f38cb2a485e0f7f6fb68 CRs-fixed: 630780
* | Camera2: the menu button should not visible in some casesKerong Sui2014-04-081-0/+2
|/ | | | | | | | | When we start camcorder from other activity, we touch home key, then back to the activity, this button will cover with the save button.The patch will fix this issue Change-Id: I74dc5f556d2a30af651d53b39c2bb4397a59884e CRs-fixed: 633613
* Camera2: Added pause button in CamcorderManikanta Kanamarlapudi2014-01-211-1/+32
| | | | | | | | | - Added pause button in camcorder app.so that user pause recording and resume later which results in a single recorded clip. CRs-Fixed: 587051 Change-Id: I2a7d8af7fcea74fe8af62c44119c3c1fa0c13e85
* Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-0/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| * Close mode menus if another control is touchedAndy Huibers2013-11-111-0/+2
| | | | | | | | | | | | Bug: 11598901 Bug: 11635865 Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573
| * hide preview cover on arrival of new preview data if hiddenAndy Huibers2013-11-071-1/+4
| | | | | | | | | | Bug: 11433257 Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
| * Show a preview cover until real preview is readyDoris Liu2013-10-151-0/+7
| | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
* | 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
* | Camera: Fix for stretched preview in camera and camcorder...Santhosh Kumar H E2013-10-311-13/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Menu & zoom options are overlapping in front camera.Alok Kediya2013-10-311-0/+7
|/ | | | | | | | | | | | | | When user presses the menuoptions the popup is displayed and UI will have the controll over it, again when zoom is triggered the zoom renderer was not hiding the menu popup. This change will synchronise both listeners mentioned above. (cherrypicked from commit 713847197c35409f0f198903f6b3dd3c39296848 ) Change-Id: Ic4509fe4473070c73dba377c5fdc3f224af71ee0 (cherry picked from commit 6c464f1402110b1f0f9790d5a9479dc3031d04eb) (cherry picked from commit 4fe74b8ad31a6d43c179e0181813ba3bf4c58feb) (cherry picked from commit e525f04730668369f76afb41870199eaad0b9375)
* Set camera controls visibility based on whether the camera preview is centered.Erin Dahlgren2013-10-141-0/+4
| | | | | Bug: 10861015 Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
* Merge "Remove display change listener for mode switch" into ↵Doris Liu2013-10-111-1/+8
|\ | | | | | | gb-ub-photos-carlsbad
| * Remove display change listener for mode switchDoris Liu2013-10-101-1/+8
| | | | | | | | | | Bug: 10928549 Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670
* | Merge "Hide the status bar and switch into lights-out mode when popup is ↵Sascha Haeberling2013-10-101-0/+4
|\ \ | |/ |/| | | dimissed." into gb-ub-photos-carlsbad
| * Hide the status bar and switch into lights-out mode when popup is dimissed.Sascha Haeberling2013-10-101-0/+4
| | | | | | | | | | | | Bug: 11119286 Change-Id: I912103f36d27b07cd6fcebc2dae7c2964e883cc8
* | Fix flash issueztenghui2013-10-091-1/+1
|/ | | | | | | | | | The flash light should show up at the same time as the control show up. Also, when we change the flash mode, we should update the flash on screen indicator. bug:11064667 Change-Id: I888d3ce76ac618a4c7b40a288ecce13555c89ab0
* Do not allow navigation to filmstrip during video recordingDoris Liu2013-10-081-2/+7
| | | | | Bug: 11064867 Change-Id: I168136a193008578b3ad2642cba764650bcc2487