summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbadAngus Kong2013-08-211-46/+16
|\
| * Fix delete animation in fullscreen mode.Angus Kong2013-08-211-46/+16
| | | | | | | | | | | | bug:10414539 Change-Id: I798492a824306d0eb479aae4e822cd9c7fbe3530
* | Stop the MediaSaveService after unbinding.Angus Kong2013-08-211-8/+6
|/ | | | | | bug:10361258 Change-Id: Ie1dc3caac03f7a691aae0c84c468bfb21ce6ae90
* Support filmstrip swipe in full-screen.Angus Kong2013-08-211-21/+63
| | | | | | bug:10341731 Change-Id: Ib4a3278f72d3e1070603d2a094f4021a947bdc56
* Merge "Update the final PhotoSphere result correctly." into ↵Angus Kong2013-08-211-202/+230
|\ | | | | | | gb-ub-photos-carlsbad
| * Update the final PhotoSphere result correctly.Angus Kong2013-08-201-202/+230
| | | | | | | | | | | | bug:10400557 Change-Id: I8e8b22b569c3b3a7f4d25e7eb46053332e2dc062
* | Merge "Fix nav bar overlapping camera bottom UI controls" into ↵Doris Liu2013-08-211-0/+2
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Fix nav bar overlapping camera bottom UI controlsDoris Liu2013-08-201-0/+2
| | | | | | | | | | | | | | | Bug: 10394750 Change-Id: Ia46d4903a2c148102bd62ca71516bd81e10fe497
* | | Merge "Remove the "button" part of the shutter button description." into ↵Sascha Haeberling2013-08-211-1/+1
|\ \ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | Remove the "button" part of the shutter button description.Sascha Haeberling2013-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10081355 Talkback automatically appends "button" to a clickable ImageView. Change-Id: I7d20b96965a5542277cb27b0fd8d255251b2cb3c
* | | | Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbadDoris Liu2013-08-212-2/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Fix video snapshot aspect ratioDoris Liu2013-08-202-2/+18
| | | | | | | | | | | | | | | | | | | | Bug: 10312002 Change-Id: Ibe2037195b3936baa63628797ea2b742825ed701
* | | | Merge "Make camera preview full screen" into gb-ub-photos-carlsbadDoris Liu2013-08-201-35/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Make camera preview full screenDoris Liu2013-08-201-35/+1
| |/ / | | | | | | | | | | | | Bug: 10328123 Change-Id: I4a72b7d7d35dba7cceecd61db9879265617c511e
* | | Merge "Updating the Camera tests makefile and source to reflect recent split ↵Jason Noguchi2013-08-2016-149/+144
|\ \ \ | | | | | | | | | | | | between camera and gallery apps." into gb-ub-photos-carlsbad
| * | | Updating the Camera tests makefile and source to reflect recent split ↵Jason Noguchi2013-08-2016-149/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between camera and gallery apps. Change-Id: Ie5b3eb918c67b1f9e77f9a1f53d3cb562d78a001
* | | | Fix squished previewDoris Liu2013-08-201-2/+2
| |/ / |/| | | | | | | | | | | Bug: 10330209 Change-Id: I0b208ccd556d8c65474ad6bce0d2ddc3c2bdb7f6
* | | Add "set as" capability in Film Stripnicolasroard2013-08-201-3/+11
| | | | | | | | | | | | | | | bug:10367174 Change-Id: I9161e08f26c02edd1d168ac6986de61066d69552
* | | Rename accessibility text for Photo Sphere mode from 'new panorama'.Sascha Haeberling2013-08-192-3/+3
| |/ |/| | | | | | | | | Bug: 10075811 Change-Id: I7a0e7f890d0243fe13e8f3746d49378daf1bb962
* | Merge "Implement deletion in the menu." into gb-ub-photos-carlsbadAngus Kong2013-08-191-1/+1
|\ \
| * | Implement deletion in the menu.Angus Kong2013-08-191-1/+1
| | | | | | | | | | | | | | | | | | bug:10367402 Change-Id: Ia48544ccb4186808f8cf89c7b4ea6d291aa8cf24
* | | 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
* | | Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbadztenghui2013-08-191-0/+6
|\ \ \ | |/ / |/| |
| * | Update the action bar style to match Bryceztenghui2013-08-191-0/+6
| | | | | | | | | | | | | | | | | | bug:10347330 Change-Id: I9a3e6f5cac0003cce4b19cba28904d539faa94a9
* | | Merge "Don't refresh item on resume as it leads to a filmstrip bug." into ↵Sascha Haeberling2013-08-191-15/+0
|\ \ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | Don't refresh item on resume as it leads to a filmstrip bug.Sascha Haeberling2013-08-191-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead we should listen to the proper events when something is changed with the media. Change-Id: Ia5337a4a83de73962070148e0a10f0a12f769345
* | | | Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbadSascha Haeberling2013-08-191-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Enable switching cameras in video mode.Sascha Haeberling2013-08-191-0/+1
| | |/ | |/| | | | | | | | | | | | | Bug: 10313018 Change-Id: I8e75341d7d37135ba7747d56a1a0e6d19ffb8eaa
* / | Bring back the bottom controls in Filmstrip.Sascha Haeberling2013-08-199-92/+374
|/ / | | | | | | | | | | | | | | | | Bug: 10367172 Bug: 10074320 Also hooks up the Edit button and the edit menu item. Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c
* | Merge "Add the trim functionality back to FilmStripView" into ↵ztenghui2013-08-192-14/+13
|\| | | | | | | gb-ub-photos-carlsbad
| * Add the trim functionality back to FilmStripViewztenghui2013-08-162-14/+13
| | | | | | | | | | | | | | | | At the same time, disable the mute for now. bug:10313015 Change-Id: Ic2139f509ddb4ed57f3a4d67782eadb150e88ea5
* | Merge "Add image 1:1 support" into gb-ub-photos-carlsbadDoris Liu2013-08-171-0/+551
|\ \
| * | Add image 1:1 supportDoris Liu2013-08-161-0/+551
| |/ | | | | | | | | Bug: 10308195 Change-Id: I7b7fcf3b46475a2d39bac27095d01d438582e516
* | Merge "Add back intent-filter for default category and main action." into ↵Mangesh Ghiware2013-08-161-0/+4
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Add back intent-filter for default category and main action.Mangesh Ghiware2013-08-161-0/+4
| | | | | | | | | | Bug: 10349073 Change-Id: I06c24cebc50fe555ec150813117955da09814fb4
* | Set views in filmstrip invisible when alpha = 0.Angus Kong2013-08-155-55/+65
| | | | | | | | | | | | bug:10096747 Change-Id: Idcb62448acbf38d581af3a08a9bcbc0cad0ab6be
* | Single-tap in fullscreen view toggles ActionBar.Sascha Haeberling2013-08-152-1/+15
| | | | | | | | | | | | Bug: 10347286 Change-Id: I55e400c957d4ec1ef1307e45007e2127ea5ab7ea
* | Implent show-on-map functionality.Sascha Haeberling2013-08-157-27/+102
| | | | | | | | | | | | | | | | | | 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
* | Merge "Brings back the details menu with most EXIF data in it. Some are ↵Sascha Haeberling2013-08-159-18/+636
|\ \ | | | | | | | | | still missing and will come back later." into gb-ub-photos-carlsbad
| * | Brings back the details menu with most EXIF data in it.Sascha Haeberling2013-08-159-18/+636
| | | | | | | | | | | | | | | | | | | | | | | | Some are still missing and will come back later. Bug: 10330505 Change-Id: I7bc44b19fac5b47557d5feae3ed969040ac3ae9b
* | | Defining broadcast intent strings as constants in CameraUtil.java.Dan Aminzade2013-08-152-4/+14
|/ / | | | | | | | | | | | | | | For now I'm leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the definitions to Camera.java. Change-Id: Ia198b843245b70d7378e1ea81ecb8b7983486446
* | Single tap to full screen mode.Angus Kong2013-08-141-18/+5
| | | | | | | | | | | | bug:10308911 Change-Id: Ia3213782091eafe6a5683a931dea1ae212e79ba3
* | Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbadAngus Kong2013-08-141-5/+25
|\ \
| * | Make current view center in filmstrip.Angus Kong2013-08-141-5/+25
| | | | | | | | | | | | | | | | | | bug:10096746 Change-Id: I458a3f1b1a2c78239e1cfaa91d6d5e1cec19507e
* | | Add support for remote shutter control via broadcast intents.Dan Aminzade2013-08-141-64/+97
|/ / | | | | | | | | | | | | | | | | Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. This change resolves b/10185077. Change-Id: I1e38039874b74460f5c815e9d2672789691e9e2f
* | Merge "Handle unexpected exceptions when loading videos." into ↵Angus Kong2013-08-142-24/+35
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Handle unexpected exceptions when loading videos.Angus Kong2013-08-142-24/+35
| |/ | | | | | | | | | | | | bug:10313671 bug:9757517 Change-Id: I8cb922599c4185a585f90007c3975841d14e179a
* | Merge "Copy over libjni_mosaic from Camera. We need to support the SRI pano ↵Sascha Haeberling2013-08-1481-0/+26185
|\ \ | | | | | | | | | mode for Carlsbad." into gb-ub-photos-carlsbad
| * | Copy over libjni_mosaic from Camera. We need to support the SRI panoSascha Haeberling2013-08-1481-0/+26185
| |/ | | | | | | | | | | mode for Carlsbad. Change-Id: Id14e64d8248236e8170c12cfca2cbf2ca952e993