summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Measure all children to ensure correct layout position" into ↵Doris Liu2013-08-301-0/+2
|\ | | | | | | gb-ub-photos-carlsbad
| * Measure all children to ensure correct layout positionDoris Liu2013-08-301-0/+2
| | | | | | | | | | Bug: 10412775 Change-Id: Ia64d6d4d0d023b208edb70066b4d4670e4ad2bbb
* | Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbadAngus Kong2013-08-301-3/+9
|\ \
| * | Skip bitmaps with 0 dimension.Angus Kong2013-08-301-3/+9
| | | | | | | | | | | | | | | | | | bug:10514553 Change-Id: I0d26a324ede55b281e60cedc174869f5b863ca31
* | | Add back button handlng to CameraActivity.Alan Newberger2013-08-301-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL first detects whether user is in filmstrip mode i.e. not in Camera, if so brings user back to the first item which is the Camera. If in Camera, we route back handling to the current Camera module which enables already- written module handling for back button e.g. backing out of pie menus. Bug: 8781981 Change-Id: I18377ea5fbdcd8bd8c6fc3af9cb5322d5f5a889a
* | | Merge "add up button support for filmstrip" into gb-ub-photos-carlsbadAlan Newberger2013-08-302-23/+35
|\ \ \
| * | | add up button support for filmstripAlan Newberger2013-08-302-23/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds up affordance handling to CameraActivity. There was no working call to reset the filmstrip back to the camera, so this CL adds a controller which then calls reload, which is itself fixed to work as desired. Note that during testing I identified issue 10563392, I've decided to file that separately since it is orthogonal to up button function, but it does affect the overall experience and should be fixed. Bug: 10414498 Change-Id: I1ee914dc1d264adb1fb5a363c2d6174070cd7b71
* | | | Merge "Let the Camera app remember which mode it was started in last." into ↵Sascha Haeberling2013-08-301-15/+47
|\ \ \ \ | |/ / / |/| | | | | | | gb-ub-photos-carlsbad
| * | | Let the Camera app remember which mode it was started in last.Sascha Haeberling2013-08-281-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7320368 Change-Id: Ia2ae47693f453c9bcff315af87fe1e5a44b6e5c7
* | | | Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbadDoris Liu2013-08-301-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix gap between camera controls and nav barDoris Liu2013-08-291-1/+1
| | |/ | |/| | | | | | | | | | Bug: 10097187 Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
* | | 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
* | | | Merge "Disable shutter button while picture is being taken." into ↵Sascha Haeberling2013-08-302-0/+7
|\| | | | |/ / |/| | | | | gb-ub-photos-carlsbad
| * | Disable shutter button while picture is being taken.Sascha Haeberling2013-08-282-0/+7
| |/ | | | | | | | | | | Bug: 7328018 Change-Id: I98160d52c542186aa9f2d85f66a4e0120a917e38
* | 1:1 zoom integrationDoris Liu2013-08-294-362/+351
| | | | | | | | | | Bug: 10308195 Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
* | Merge "Flip capture thumb when using front facing camera" into ↵Doris Liu2013-08-292-10/+18
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Flip capture thumb when using front facing cameraDoris Liu2013-08-282-10/+18
| | | | | | | | | | Bug: 10495008 Change-Id: I9f444625e64be35afe44b0d7f50d81fbd1936ae8
| * Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbadTenghui Zhu2013-08-2828-6478/+172
| |\
| | * Revert "Add rotate support in Film Strip"Tenghui Zhu2013-08-2828-6478/+172
| | | | | | | | | | | | | | | | | | This reverts commit 568ad02f9fd3993abf4b973bdd49a34737267c77. Change-Id: I300376126b55191e4112b8aabf3f9f61cc27fef6
| * | Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbadztenghui2013-08-2828-172/+6478
| |\|
| | * Add rotate support in Film Stripztenghui2013-08-2728-172/+6478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I0b8128a806fa9e777a87967b294555daadced1c5
* | | Add rotate support in Film Stripztenghui2013-08-2828-172/+6478
|/ / | | | | | | | | | | | | | | | | 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
* | Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbadMangesh Ghiware2013-08-273-20/+99
|\ \
| * | Bring back Share to filmstripMangesh Ghiware2013-08-263-20/+99
| | | | | | | | | | | | | | | Bug: 10367406 Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0
* | | Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbadSascha Haeberling2013-08-271-4/+0
|\ \ \ | |/ / |/| |
| * | Remove Refocus string and iconSascha Haeberling2013-08-261-4/+0
| | | | | | | | | | | | | | | | | | Bug: 10494566 Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372
* | | Make parsing integers for details dialog more robust.Sascha Haeberling2013-08-261-4/+25
|/ / | | | | | | | | | | Bug: 7141309 Change-Id: I031e2f062ea786acb94d41385c5913c47d719ccd
* | 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-233-30/+81
|\ \ | |/ |/|
| * Bring back undo delete confirmation.Angus Kong2013-08-233-30/+81
| | | | | | | | | | | | | | | | | | 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-223-20/+49
|/ | | | | | 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 "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
* | | Fix squished previewDoris Liu2013-08-201-2/+2
|/ / | | | | | | | | Bug: 10330209 Change-Id: I0b208ccd556d8c65474ad6bce0d2ddc3c2bdb7f6
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 08:05:10 +0000