summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/WideAnglePanoramaUI.java
Commit message (Collapse)AuthorAgeFilesLines
* snap: Panorama fixesSteve Kondik2016-11-221-12/+4
| | | | | | | | * Fix animations and transitions * Disable warped preview overlay, this looks terrible and needs rewritten. Change-Id: I9474219c57fc204dd16797aa8921296e61cc9d37
* Remove unused menu indicators code.Danny Baumann2016-11-171-2/+1
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* snap: UI checkpoint #2Steve Kondik2016-11-131-1/+5
| | | | | | | | | | * Fix bugs from previous commit * Factor out recording controls * Clean up layouts * Asynchronous control for video module * Performance improvements Change-Id: I9d5833cecbd9280845b740ee8a3c47f023470625
* snap: UX improvements v1Steve Kondik2016-11-131-79/+37
| | | | | | | | | | | | | * Make the camera controls do sane things- get rid of the manual placement of every widget and use layouts * Animate everything correctly * Show ripples when clicking the shutter * Clean up a metric ton of dead code * Moved more code into BaseUI * Make setting up the camera controls less verbose and magical * Fixed up panorama layout Change-Id: Iaed44ca0201a2e2641e1c2460d3ff9ec3eae2d85
* Reenable left swipe for FilmstripSteve Kondik2016-11-091-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * These commits are from the CameraNext application in COS. * Credits: Ed Carrigan, Ed Mancebo, Wilhelm Fitzpatrick Revert "SnapdragonCamera: Fix preview broken when coming back from gallery" This reverts commit 5b8948f83a65e8f9bd1b419bd11511e48dc34887. Revert "SnapdragonCamera: fix crash after photo deletion" This reverts commit 171d2b253a752ca104ccf4a58f4e9d6d82bd7b28. CameraNext: Fix camera crash on device unlock This patch from the plugin branch also fixes CYNGNOS-1878 Due to the bug below, when the camera is fore-grounded when device is unlocked, the SurfaceView is getting recreated, which caused it to be in a weird state when we were trying to reattach the preview to it. ----- Fixed Black Screen On Back. The issue was that mCameraView was not being populated when it should have been (after it had been added to the view hierarchy). The problem was the SurfaceView was being removed from the hierarchy when it shouldn't have been. Issue-Id: CP-129 (cherry picked from commit 4010462fe0b4cf1c15624cfca7d6a3d4d380613a) CameraNext: avoid scaling camera preview in filmstrip (cherry picked from commit 823ed983c4dccac3959635f1a14fcfe47cd7b120) CameraNext: fade camera preview to black during film strip transition Instead of scaling and translating the camera preview to make room for film strip images, we leave the preview in place and cover it gradually with the black preview cover. CameraNext : Add offset calculation for left navbar Also prevent preview from translating while hidden - was causing occasional glimpses of it in filmstrip. CameraNext : Ensure vertical/horizontal swipes don't conflict Ensure that the user can't swipe horizontally while trying to delete the image. Avoids all sorts of synching issues between mViewItem and the data adapter since the buffer is trying to constantly keep its center to be the current visible item CYNGNOS-1069 CameraNext: fix crash on entering filmstrip via thumbnail tap mVerticalViewId was getting initialized in onUp, but if filmstrip was entered without a swipe, no onUp occurred. Fixed by directly initializing the field on object creation. CameraNext: Fix ZoomView in the filmstrip The ZoomView was getting covered in the Z axis while scrolling. issue-id: SAMBAR-862 Revert "SnapdragonCamera: fix camera preview broken when resume from gallery" This reverts commit 0acc1f027637c4f0126883be68f97817d7306032. Change-Id: If4dd591c5c752a7fa33c669c15875c0077446a37
* Avoid static member variable.Danny Baumann2016-11-021-1/+1
| | | | Change-Id: I3758bb219552d22768afa0af83c69c6a5460693b
* SnapdragonCamera: Preview button should not work in secure modeJing (Mia) Wang2016-10-041-8/+10
| | | | | | | | | When camera is in secure mode, it will still listen to the preview event although the circle is invisible to the user. So disable the event listener of preview button. Change-Id: Ic4f1dbf32163a7f210e3f4b87599699f44e8f7b0 CRs-Fixed: 1002685
* SnapdragonCamera: Fix panorama cancel button locationByunghun Jeon2016-07-061-1/+1
| | | | | | | | | Panorama cancel button location is not correct when device is rotated by 180 degrees. Set the proper value to the button when rotated by 180 degrees. Change-Id: I16cb6978f9b612944413fbc400d6aec920599ba7 CRs-Fixed: 1035742
* SnapdragonCamera: Fix the memory leak on view.Jack Yoo2016-01-301-0/+4
| | | | | | | | Keep using modules instead of creating. Don't remove the view without cleaning it. Change-Id: I260a660cac3d770f7d02dfdc1881e15490da66a0 CRs-Fixed: 958510
* SnapdragonCamera: Introducing mute buttonCamera Software Integration2015-12-221-0/+4
| | | | | | | Introducing audio mute button on video recording Change-Id: I69ff6fe97c4b8d76a890b5e41667dab534d69ba8 CRs-Fixed: 937239
* SnapdragonCamera: Do not update panorama thumbnail when cancelledCamera Software Integration2015-12-221-2/+10
| | | | | | | Do not update thumbnail when panorama is cancelled. Change-Id: I3db9f9614b35ee4e475fbb7b1dc801b77e6ed6bd CRs-Fixed: 934157
* SnapdragonCamera: The alert dialog's rotation is not rightlikaid2015-03-261-15/+16
| | | | | | | | | | | It will pop up a alert dialog if something goes wrong while generating mosaic. The alert dialog's rotation is not right, as a result, the alert dialog's UI will gose wrong. Use RotateLayout to set the rotation before we show the alert. Change-Id: Iaa91e811393a90c9f28f98404d782d2cc2ad9fe9 CRs-Fixed: 805471
* Snapdragon: Fix orientation of Prepare panorama dialogByunghun Jeon2015-02-251-7/+7
| | | | | | | Put Prepare panorama dialog to proper orientation instead of fixed to portrait Change-Id: I0f3bc9bcd5a5e30566c37b1e7beac9df73af7e61
* SnapdragonCamera: circular thumbnail iconLikai Ding2015-02-171-24/+5
| | | | | | | | | | 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)
* SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-02-091-13/+41
| | | | | | | | | 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
* SnapdragonCamera: fix portrait orientationLikai Ding2015-02-021-0/+98
| | | | | | | | | | | | 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
* Merge "SnapdragonCamera: New shutter Icons"Linux Build Service Account2015-01-231-1/+1
|\
| * SnapdragonCamera: New shutter IconsByunghun Jeon2015-01-201-1/+1
| | | | | | | | | | | | Add new shutter icons for SnapdragonCamera Change-Id: Ic0abf1b509800133bbd9dbee0cc34ebca02e5bcb
* | Revert "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"Jay Wang2015-01-131-0/+8
|/ | | | This reverts commit 8c1e4ff06d80d69792170f0cab8dea2f490cb7fa.
* Merge "SnapdragonCamera: fix app crash when switch to camcorder"Linux Build Service Account2015-01-071-0/+7
|\
| * SnapdragonCamera: fix app crash when switch to camcorderkaiyiz2014-12-161-0/+7
| | | | | | | | | | | | | | | | | | | | Camera app crash when switch to camcorder during continuously shooting. Prohibition click event when continuously shooting. CRs-Fixed: 744811 Change-Id: Ia51ca53d46e060c2a4f4e877c37f795526532be7
* | SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-01-051-8/+0
|/ | | | | | | | | | | | 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 Change-Id: I98735dbed2ff4dada8708bf5a4a0f9da6ba030c7 Conflicts: res/layout-land/pano_preview_progress.xml res/layout-port/pano_preview_progress.xml
* SnapdragonCamera: Add preview thumbnail buttonByunghun Jeon2014-11-191-0/+32
| | | | | | Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-171-1/+9
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* 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
* Revert "Camera: Mem-leak"Vijay kumar Tumati2014-06-191-2/+0
| | | | | | | | | | This reverts commit 46b761ab50e36daa2ff79527553014905e784895. We see some regressions with this change so we are reverting it for now. We will fix the issues soon. Change-Id: I59da92087006cef0da16c8a11fe7c31f32aa0312
* Camera2: missing rendering progress bar workaroundLikai Ding2014-06-171-0/+4
| | | | | | | | If panorama capture is stopped by device rotation, the rendering progress bar is sometimes not shown due to wrong layout result. Call requestLayout() on the progress bar as a workaround. Change-Id: Ib7c848e9ae3ced956dcc88877bb7f33357cdb588
* Camera: Mem-leakSuman Mukherjee2014-06-091-0/+2
| | | | | | | | | | | Hprof identified memleak in localdatalist from list and hashmap Reason: removedata was not getting invoked. Fix Made: Invoke removedata from ondestroy and onresume of camera activity Cleanup bitmaps before reallocation on same variable. CRs-Fixed: 655256 Change-Id: I42d99beb7e493eea2394462ee02cbe956e86c502
* Camera2: Fix camera application memory leakGaoxiang Chen2014-04-241-0/+1
| | | | | | | | | | | | | This change fix potential memory leak of camera application when swith between camera and panorama: 1. free allocated frames in jni/Mosaic 2. use application context instead of acitivity context 3. clear disappearing children of ViewGroup explicitly 4. remove IdleHandler during camera exit CRs-fixed: 622518 Change-Id: I2583709489ab2cf1fc20865fe7d2a8f56f2763c9
* Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-0/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * hide preview cover on arrival of new preview data if hiddenAndy Huibers2013-11-071-1/+4
| | | | | | | | | | Bug: 11433257 Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
| * Fix SRI orientation on mantaDoris Liu2013-10-181-2/+7
| | | | | | | | | | Bug: 11292213 Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
| * Show a preview cover until real preview is readyDoris Liu2013-10-151-0/+7
| | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
* | Camera2: Adds support for longshot/burst modeAlok Kediya2013-11-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Fix SRI orientation on mantaDoris Liu2013-10-201-2/+7
|/ | | | | Bug: 11292213 Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
* Merge "Set camera controls visibility based on whether the camera preview is ↵Erin Dahlgren2013-10-141-0/+12
|\ | | | | | | centered." into gb-ub-photos-carlsbad
| * Set camera controls visibility based on whether the camera preview is centered.Erin Dahlgren2013-10-141-0/+12
| | | | | | | | | | Bug: 10861015 Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
* | Fix SRI upside down preview in reverse landscape and reverse portraitDoris Liu2013-10-141-3/+26
|/ | | | | | | | | Also make sure preview is not upside down after device flip, and fix camera controls jiggering during rotation Bug: 11216647 Bug: 11174540 Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
* Fix SRI UX issues and improve UI efficiencyDoris Liu2013-09-241-28/+45
| | | | | Bug: 10674078 Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441
* Don't show menu/indicators in wide-angle mode.Angus Kong2013-09-131-1/+3
| | | | | | bug:10674078 Change-Id: I08edd11ead1c71cd6b81274938c92f788c039a8f
* Bring back wide angle panorama.Angus Kong2013-09-041-0/+461
bug:10293937 Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05