summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove RefocusHelper.Sascha Haeberling2013-08-261-32/+0
| | | | | | Bug: 10494566 Change-Id: I0e5c665867fe324883ff199327df1ef3736cc7c7
* Remove Refocus string and iconSascha Haeberling2013-08-263-6/+0
| | | | | | Bug: 10494566 Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372
* Fix full-screen swipe layout.Angus Kong2013-08-231-53/+112
| | | | | | bug:10428905 Change-Id: Ie4907735cc86f2d10bd936ce2d9af54cccab7ece
* Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbadAngus Kong2013-08-236-67/+162
|\
| * Bring back undo delete confirmation.Angus Kong2013-08-236-67/+162
| | | | | | | | | | | | | | | | | | 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-224-21/+50
|/ | | | | | Bug: 7141309 Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b
* Merge "Speed up filmstrip by not decoding with default 3000px." into ↵Sascha Haeberling2013-08-222-9/+10
|\ | | | | | | gb-ub-photos-carlsbad
| * 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
* | Fix preview thumb orientationDoris Liu2013-08-212-7/+15
| | | | | | | | | | Bug: 10428123 Change-Id: I7c6f37db66d9e10a07f555902b214009156736c1
* | Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbadAngus Kong2013-08-224-39/+75
|\ \
| * | Add support to "go-to-next" in film strip.Angus Kong2013-08-214-39/+75
| |/ | | | | | | | | | | bug:10328123 Change-Id: I018876df89cc7ed125a32af850e6b26114fb1004
* | Merge "Fix video capture animation and video snapshot animation" into ↵Doris Liu2013-08-223-462/+67
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Fix video capture animation and video snapshot animationDoris Liu2013-08-213-462/+67
| | | | | | | | | | | | | | | | Also removed unused effects recording code Bug: 10326106 Bug: 10414112 Change-Id: I904a26a0b10c75fcce650dc0ec63d7c11746dc2e
* | 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