summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoUI.java
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
* Clean up ApiHelper and remove unused code paths.Sascha Haeberling2013-09-181-14/+2
| | | | | | | | | Bug: 10821545 As we're targeting ICS there are a lot of checks and code paths that are no longer in use. This CL cleans them up. Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
* Fix the flash mode transition in video modeztenghui2013-09-111-5/+6
| | | | | | | | | | onSwitchMode is wrongly overloaded, now is fixed. Basically, onCurrentDataChanged will handle the switching in and out of Camera. onDataFullScreenChange will handle full screen change on non-preview data. bug:10610967 Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
* Bring back wide angle panorama.Angus Kong2013-09-041-7/+5
| | | | | | bug:10293937 Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
* Fix gap between camera controls and nav barDoris Liu2013-08-291-1/+1
| | | | | Bug: 10097187 Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
* Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbadAngus Kong2013-08-221-1/+1
|\
| * Add support to "go-to-next" in film strip.Angus Kong2013-08-211-1/+1
| | | | | | | | | | | | bug:10328123 Change-Id: I018876df89cc7ed125a32af850e6b26114fb1004
* | Fix video capture animation and video snapshot animationDoris Liu2013-08-211-0/+16
|/ | | | | | | | Also removed unused effects recording code Bug: 10326106 Bug: 10414112 Change-Id: I904a26a0b10c75fcce650dc0ec63d7c11746dc2e
* Fix video capture intent handlingDoris Liu2013-08-131-8/+10
| | | | | | Bug: 10296343 Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435
* Clean up Gallery codes.Angus Kong2013-08-091-10/+10
| | | | | | bug:10263696 Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
* Use PopupWindow for settings popupDoris Liu2013-08-091-30/+41
| | | | | Bug:10261902 Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
* This adds the following four CLs to Camera2:Sascha Haeberling2013-08-061-11/+27
| | | | | | | | | | | | http://ag/339319 http://ag/338974 http://ag/338401 http://ag/324149 Adapted to work in Camera2 and adding a .gitignore so that temporary Eclipse files and folders are not submitted. Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-061-3/+3
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Remove unnecessary startPreview thread in video.Angus Kong2013-07-151-15/+4
| | | | Change-Id: I42dc46748fad3b321178280069555ecdd5c4a962
* Clean up PreviewGesturesMichael Kolb2013-06-261-3/+0
| | | | | | | - remove dead code and state - fix zoom only mode during video recording Change-Id: I2238f99b9823ba091d300046d07448c67bc2ad78
* Clean up camera switcherDoris Liu2013-06-241-1/+1
| | | | Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
* Switch over to use new camera activityDoris Liu2013-06-181-110/+277
| | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* Dismiss settings when showing popup in Video mode.Angus Kong2013-05-291-0/+1
| | | | | bug:8771618 Change-Id: I889b794c6732b674e26436f950e81f67529012e7
* Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-211-0/+21
| | | | | | | | Bug: 9054122 Also make gotoGallery public for LightCycle to use. Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc
* Fix video capture intent overlapping buttonsDoris Liu2013-05-071-0/+3
| | | | | Bug: 8839010 Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
* Update location indicator correctlyMichael Kolb2013-04-301-1/+5
| | | | | | Bug: 8768592 Change-Id: I8f94b4fb62174c4c27e6dbdc68ba272b0d3ae371
* Add new indicatorsMichael Kolb2013-04-261-1/+1
| | | | | | Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
* Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryceDoris Liu2013-04-241-3/+3
|\
| * Fix for popuping being hard to dismissDoris Liu2013-04-231-3/+3
| | | | | | | | | | Bug: 8688503 Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3
* | Fixes video mode indicators by resetting them on init.Sascha Haeberling2013-04-231-19/+5
|/ | | | | | Bug: 8696004 Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a
* Allow swiping to filmstrip from blocker barDoris Liu2013-04-181-2/+2
| | | | | Bug: 8607910 Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
* Work in progress - Put preview in TextureViewDoris Liu2013-04-091-1/+0
| | | | | | | | | | | Fixed gesture recognizing and pie menu. Fixed camera picker. Exposure setting got fixed with rebasing. Rebased for new pie menu Fixed camera mode switch listener Ongoing: secure album, aspect ratio for video recording on ICS Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
* Pie design updateMichael Kolb2013-04-011-2/+17
| | | | Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
* Disable preview gestures when shutter is pressedDoris Liu2013-03-271-0/+6
| | | | | Bug:8333662 Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
* Use Model-View-Controller pattern on video moduleDoris Liu2013-03-131-0/+510
Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 04:26:00 +0000