summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/data
Commit message (Collapse)AuthorAgeFilesLines
* CameraNext: Use Glide for async bitmap loadingcretin452016-11-097-198/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what Camera2 code uses. Addresses SAMBAR-766 CameraNext: Fix rotation not updated The thumbnail generated by Glide is not updated when user rotate the image manually. This is because exif is rewrite using nio mmap, however there is no nio unmap available in java. Even though the file channel is closed, the rotation modification is still in buffer, when Glide tries to dtermine the orientation of the image, it still reads the old data. Use force to ensure data is sync to disk and buffer flushed. HAM-1389 Fix memory leaks Two leaks were occuring. One was an unused Parameters in AndroidCameraManagerImpl that was holding onto excess PhotoModules. The second was Glide images for video previews that were never being cleared on recycle. issue-id: CYNGNOS-2731 CameraNext: don't call Glide to load image after Camera exits There is a race condition where the filmstrip can still be trying to load a new image just as the camera exit, and Glide gets upset if it is handed a destroyed activity context to work with. So just check for that condition and go home. Change-Id: I9e76ab40d23213c7a74c26779e345207d5fd7bae Ticket-Id: CRACKLING-1068
* Reenable left swipe for FilmstripSteve Kondik2016-11-093-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* SnapdragonCamera: Implement circular buffer for CSJay Wang2016-09-271-4/+6
| | | | | | | | | | Implement a buffer cache system for Clearsight registration. Pre-allocate required number of buffers and re-use. Remove loading bitmaps to CameraDataAdapter after capture as we no longer are using FilmStripView. CRs-Fixed: 1054487 Change-Id: I6af94b701efa85e8f3848b8c8e508bb688bc2f13
* SnapdragonCamera: Fix can't launch gallery after switch storageqimengp2016-09-081-5/+10
| | | | | | | | | | | | Camera can't query media URI successfully when we switch storage path. Because camera use a static final field to hold storage path name which is only initialized once and will not change any more, even if camera use a static method to initialize this field. By replacing this static final field with a static method can avoid this issue, as static method will get real time value. Change-Id: I49c2d81afe0e872483b4ab353c94746165c5a294
* SnapdragonCamera: Add preview thumbnail buttonByunghun Jeon2014-11-191-0/+1
| | | | | | Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-164-4/+4
| | | | | | | | 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-193-25/+6
| | | | | | | | | | 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
* Camera: Mem-leakSuman Mukherjee2014-06-093-6/+25
| | | | | | | | | | | 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
* Camera: Add a feature to choose where to store the picture and videoSanthosh Kumar H E2014-02-271-2/+7
| | | | | | | | | | | | Add a feature to choose use SDcard or phone to store picture and video captured by camera and camcorder. Some of the changes are taken from: I987a691c93edc4250fe0366d0623c85ea0152117 CRs-Fixed: 619806 Change-Id: I009df4c70f0a1b49b20750f806c799f025bb6197
* Close open cursorsSuman Mukherjee2014-02-112-0/+4
| | | | | | | | | Cursors which got created during any query, needs to be closed finally. Otherwise it'll cause leak in resource and cursor window allocation will fail. Change-Id: I65ace2dc227e0a50c163faba13fdb0fbfa71bc6c CRs-Fixed: 594264
* Merge "Camera: Check file existence before update"Linux Build Service Account2013-12-072-5/+17
|\
| * Camera: Check file existence before updateAshok Raj Deenadayalan2013-11-282-5/+17
| | | | | | | | | | | | | | | | | | Recorded file must exist for updation. Check if the file exists before you update to avoid crash. Treat file non-existence as a error case and proceed further. Change-Id: I31954d51f0c34ef3d0ee25cb30d243804bc93fc3 CRs-Fixed: 573040
* | Differentiate the InProgressData from the normal PhotoData.ztenghui2013-11-121-1/+6
| | | | | | | | | | | | | | | | | | | | When we load from MediaStore, we should differentiate the data still in progress, e.g. HDR+, which should show the progress bar and hide the action bar items. bug:11634500 bug:11598186 Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58
* | gcam: Add placeholder image.Ruben Brunk2013-10-281-1/+21
|/ | | | | | Bug: 11050749 Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
* Keep the ImageData size info consistent with MediaStore and Exifztenghui2013-10-072-24/+5
| | | | | | | | Basically, the width and hight in the ImageData will be pre-rotation. bug:11067085 Change-Id: I377caf2f1d49d26b4d6823d4e72168a055d80858
* Don't allow actions on items in progress.Angus Kong2013-10-035-22/+217
| | | | | | bug:11049529 Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd
* Fix MediaStore correction code.ztenghui2013-09-301-0/+44
| | | | | | | | | | This reverts commit fb344efde20ffab903fae7c6e5a2e1c90b4ef085. And this CL make sure we handle rotated image correctly and update the MediaStore according to the bitmap size. bug:10988273 Change-Id: I9acb60e0dd485292748bcc586801f76bc7a543dc
* Temporary removal of resize code to evaluate GCam image bugAlan Newberger2013-09-291-40/+0
| | | | | | | | | removes LocalMediaData resize code to evaluate black screenshots. this results in correct display of GCam photos newly taking in KRS91; prior GCam photos will look distorted due to incorrect EXIF. Bug: 10988273 Change-Id: I7fedffeeb1823da857f4c92433c6213d6697bda0
* Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into ↵Sascha Haeberling2013-09-281-0/+1
|\ | | | | | | gb-ub-photos-carlsbad
| * Add basic EXIF to the tiny planet so that rotate succeeds.Sascha Haeberling2013-09-271-0/+1
| | | | | | | | | | | | Bug: 10861115 Change-Id: I1eec2bf4d6879c227a07c5364bc821749ace312b
* | Fix incorrect width and height from MediaStore.ztenghui2013-09-276-18/+81
| | | | | | | | | | | | bug:10768232 Change-Id: I53673b8ef341f7388a9a4aaa7b03f804485928cf
* | Don't update the width and height in MediaStore after rotationztenghui2013-09-271-7/+5
|/ | | | | | bug:10917681 Change-Id: I897d883636991f5b95290acf57c2a84eadd7c5d2
* Merge "Add orientation information to the details dialog." into ↵Sascha Haeberling2013-09-271-0/+1
|\ | | | | | | gb-ub-photos-carlsbad
| * Add orientation information to the details dialog.Sascha Haeberling2013-09-261-0/+1
| | | | | | | | | | | | Bug: 10649902 Change-Id: Icaf17abdbd48a86d55e1555115fdb7817faf6359
* | Fix memory leak of context in LocalMediaObserverDoris Liu2013-09-261-12/+20
|/ | | | | Bug: 10728773 Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b
* Improve the animation to filmstrip.Angus Kong2013-09-203-4/+4
| | | | | | | | | | | 1. Remove the snap-in-center check at the end of scale animation. 2. Don't go back to full-screen when animating from camera preview to filmstrip. bug:10806298 bug:10864100 Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
* Use contentObserver to refresh the data when dirty.ztenghui2013-09-192-12/+62
| | | | | | | | | Handle another setDataSource exception. Remove the old work around for refreshing after editing. bug:10390298 Change-Id: I8777364b96c86eeaf5581a96163aab823cd4b438
* Fix zoom for images with orientation tagDoris Liu2013-09-162-0/+11
| | | | | Bug: 10780042 Change-Id: I518bf8a6e2b53647398180e60b55533960ebe318
* Avoid expensive O(n) main-thread operation when adding Photo Sphere.Sascha Haeberling2013-09-162-21/+114
| | | | | | Bug: 10747001 Change-Id: I8dcc3c5e7dd12879a927aa82e71bea0c6370ccda
* Fix crash due to a hole in setDataSource.ztenghui2013-09-121-1/+3
| | | | | | | | setDataSource() somehow throws a RuntimeException instead of IllegalArgumentException when seeing unsupported video file. bug:10732664 Change-Id: I79ab1f1afd8750bb37df0c8fc9448dbb2e00230a
* Make sure we switch to preview view when resuming.Sascha Haeberling2013-09-096-19/+24
| | | | | | | | | | Bug: 10640328 But we need to make sure to not always switch in onResume, as some activities stared from us (like playing a video or editing) require the UI flow to stay in filmstrip. Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf
* Skip bitmaps with 0 dimension.Angus Kong2013-08-301-3/+9
| | | | | | bug:10514553 Change-Id: I0d26a324ede55b281e60cedc174869f5b863ca31
* Merge "Fix of memory issues with bitmaps in filmstrip." into ↵Sascha Haeberling2013-08-301-1/+1
|\ | | | | | | gb-ub-photos-carlsbad
| * Fix of memory issues with bitmaps in filmstrip.Sascha Haeberling2013-08-301-1/+1
| | | | | | | | | | | | | | | | Bug: 10495593 We should use the bigger scale factor of the two, and not the smaller. Change-Id: I5a1ff6fe7d6b50c0128ff17709daa94cef9cb65b
* | 1:1 zoom integrationDoris Liu2013-08-292-8/+2
|/ | | | | Bug: 10308195 Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
* Add rotate support in Film Stripztenghui2013-08-286-160/+407
| | | | | | | | | Move the exif related code under src.com.android.camera.exif. Refactor the member variables under LocalMediaData.java. Refactor the LocalData to make sure they are immutables for thread safety. bug:10367037 Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
* Bring back Share to filmstripMangesh Ghiware2013-08-262-13/+31
| | | | | Bug: 10367406 Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0
* Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbadAngus Kong2013-08-231-1/+1
|\
| * Bring back undo delete confirmation.Angus Kong2013-08-231-1/+1
| | | | | | | | | | | | | | | | | | Also corrects the default decoding size. bug:10413110 bug:10330214 Change-Id: I45465fdea2320501fd17ac4e35e0f0f54c08cbba
* | Proper I18N of the Details dialog, especially for RTL.Sascha Haeberling2013-08-222-6/+9
|/ | | | | | Bug: 7141309 Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b
* Speed up filmstrip by not decoding with default 3000px.Sascha Haeberling2013-08-212-9/+10
| | | | | | | | | | Bug: 10330214 Bug: 10430152 We need to tell the wrapped data adapters about the size we need. Also, use a more efficient way to determine the sample size. Change-Id: Ie2c6fb438f06d97d6e5420afdceccccf41040020
* Add video details to the details menuSascha Haeberling2013-08-192-63/+107
| | | | | | | | Bug: 10330505 Also fix a potential NPE issue and some minor reformatting. Change-Id: I89a32645a497d1f19d935b96bd1997e6fdf902b2
* Bring back the bottom controls in Filmstrip.Sascha Haeberling2013-08-193-0/+31
| | | | | | | | | Bug: 10367172 Bug: 10074320 Also hooks up the Edit button and the edit menu item. Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c
* Set views in filmstrip invisible when alpha = 0.Angus Kong2013-08-154-27/+1
| | | | | | bug:10096747 Change-Id: Idcb62448acbf38d581af3a08a9bcbc0cad0ab6be
* Implent show-on-map functionality.Sascha Haeberling2013-08-154-16/+42
| | | | | | | | | Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view. Bug: 10346208 Bug: 10330505 Change-Id: Idaeec207bcc0e7311fa3b651868515ccea81d083
* Brings back the details menu with most EXIF data in it.Sascha Haeberling2013-08-155-16/+273
| | | | | | | | Some are still missing and will come back later. Bug: 10330505 Change-Id: I7bc44b19fac5b47557d5feae3ed969040ac3ae9b
* Handle unexpected exceptions when loading videos.Angus Kong2013-08-141-6/+35
| | | | | | | bug:10313671 bug:9757517 Change-Id: I8cb922599c4185a585f90007c3975841d14e179a
* Fix camera preview stopped after onResume().Angus Kong2013-08-132-1/+11
| | | | | | | | | | | This fix is for the blank camera preview blank after onPause() -> onResume(). 1. Refined camera start up procedure by removing redundant camera startup thread. 2. Cleanup unused calls after aparted from gallery. bug:10189998 Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
* Add local data types.Angus Kong2013-08-124-13/+60
| | | | | | | | We need local data types to generate different menus. bug:10245009 Change-Id: I95f947c11ad3f39172c43f75f4108bf720148278
* Don't return null if there's no images to load.Angus Kong2013-08-121-4/+7
| | | | | | bug:10294250 Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 20:46:05 +0000