summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/data
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Don't set mImages to null, as we call .size() later.Sascha Haeberling2013-08-121-1/+1
| | | | | | Bug: 10293573 Change-Id: I5fab2bc4fe355c4c26dcab9b6b71ff14e7216502
* Merge "Clean up Gallery codes." into gb-ub-photos-carlsbadAngus Kong2013-08-101-2/+2
|\
| * Clean up Gallery codes.Angus Kong2013-08-091-2/+2
| | | | | | | | | | | | bug:10263696 Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
* | Fix NPE after capture when camera roll is empty.Angus Kong2013-08-091-11/+2
|/ | | | | | | | Use empty array instead of null. bug:10264304 Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258
* Fix DataAdapter wrapper classes callback mechanism.Angus Kong2013-08-091-3/+21
| | | | | | Also to fix FilmStripView to avoid NPE before data is loaded. Change-Id: I6c8a3d215d9f1dc72b4207e52023c1e27e9df123
* Refactor data/LocalData.Angus Kong2013-08-075-712/+762
| | | | | | Make the design more easily understood. Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
* This adds the following four CLs to Camera2:Sascha Haeberling2013-08-066-111/+330
| | | | | | | | | | | | 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-063-25/+18
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Add LocalDataAdapter and wrappers.Angus Kong2013-08-017-175/+620
| | | | | | | | | | | | | | | | 1. FixedFirstDataAdapter wraps another adapter and add a data at the first position. 2. FixedLastDataAdapter wraps another adapter and add a data at the last position. 3. Make the LocalData interface more complete. - onFullScreen() - canSwipeInFullScreen() - getPath() 3. Add methods to the FilmStripView.DataAdapter to receive UI events. - onDataCentered() - onDataFullScreen() Change-Id: I26d3a3b7facd0c451af43ce5fbbcab2baaaec427
* Adds back the PhotoSphere View icon in filmstrip.Sascha Haeberling2013-08-013-15/+195
| | | | | | | | | | | This also exercises the "leave a place cleaner than you found it" rule by cleaning up stuff: - Formatting according to the Android format rules - Removing unused code - Putting braces where they belong. Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
* Merge "Add fullscreen mode." into gb-ub-photos-carlsbadAngus Kong2013-06-261-1/+2
|\
| * Add fullscreen mode.Angus Kong2013-06-261-1/+2
| | | | | | | | | | | | | | | | | | 1. Single tap to center a picture. 2. Double tap to fullscreen 3. In fullscreen, the next picture is on the left but the previous one is under the current one. Change-Id: I728da2487ea649162be4f1858a8524331c625157
* | Fix check of failing decoding boundaries callsAngus Kong2013-06-262-15/+6
|/ | | | Change-Id: I7b7780de9988312f9ce79c2a27132b7f6acb1c4e
* Don't use post-ICS API View.setBackground().Angus Kong2013-06-251-22/+34
| | | | | | View.setBackground() is API level 16. Change-Id: I7e56939efbcaa6e152c19c37a4a54a133bed3b47