summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am 18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbadMangesh Ghiware2013-08-274-22/+106
|\| | | | | | | | | | | | | | * commit '18d1d26a6da997bc0d9aa4d5688203f36c15377a': Bring back Share to filmstrip
| * | Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbadMangesh Ghiware2013-08-274-22/+106
| |\ \
| | * | Bring back Share to filmstripMangesh Ghiware2013-08-264-22/+106
| | | | | | | | | | | | | | | | | | | | Bug: 10367406 Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0
* | | | am 00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbadSascha Haeberling2013-08-261-32/+0
|\| | | | | | | | | | | | | | | | | | | * commit '00279bbcf7926189a7ae944988f6eceb91aae422': Remove RefocusHelper.
| * | | Merge "Remove RefocusHelper." into gb-ub-photos-carlsbadSascha Haeberling2013-08-271-32/+0
| |\ \ \
| | * | | Remove RefocusHelper.Sascha Haeberling2013-08-261-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10494566 Change-Id: I0e5c665867fe324883ff199327df1ef3736cc7c7
* | | | | am 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbadSascha Haeberling2013-08-263-6/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '143eb46b81202601e5454d460ea80a4796ecf43d': Remove Refocus string and icon
| * | | | Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbadSascha Haeberling2013-08-273-6/+0
| |\| | | | | |/ / | |/| |
| | * | Remove Refocus string and iconSascha Haeberling2013-08-263-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 10494566 Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372
* | | | Merge "Adding back the camera tests to KLP-DEV after sorting them out in ↵Yu Shan Emily Lau2013-08-2621-0/+1791
|\ \ \ \ | | | | | | | | | | | | | | | UB." into klp-dev
| * | | | Adding back the camera tests to KLP-DEV after sorting them out in UB.Jason Noguchi2013-08-2621-0/+1791
| | | | | | | | | | | | | | | | | | | | Change-Id: I963aa71a31580fd42edc17a5f226b6d2c02b6f79
* | | | | am 3be7f94c: Make parsing integers for details dialog more robust.Sascha Haeberling2013-08-261-4/+25
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '3be7f94c1029728a8e236cfcde9c8bce68244095': Make parsing integers for details dialog more robust.
| * | | | Make parsing integers for details dialog more robust.Sascha Haeberling2013-08-261-4/+25
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 7141309 Change-Id: I031e2f062ea786acb94d41385c5913c47d719ccd
* | | | am 80af7dd8: Fix full-screen swipe layout.Angus Kong2013-08-231-53/+112
|\| | | | | | | | | | | | | | | | | | | * commit '80af7dd871547d03ee9ff5023cbec00b1d8677ee': Fix full-screen swipe layout.
| * | | Fix full-screen swipe layout.Angus Kong2013-08-231-53/+112
| | | | | | | | | | | | | | | | | | | | | | | | bug:10428905 Change-Id: Ie4907735cc86f2d10bd936ce2d9af54cccab7ece
* | | | am a2818f58: Merge "Bring back undo delete confirmation." into ↵Angus Kong2013-08-236-67/+162
|\| | | | |/ / |/| | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'a2818f58b829f07021d69a36a831dcf339e9258a': Bring back undo delete confirmation.
| * | 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
* | | am e2fb9943: Proper I18N of the Details dialog, especially for RTL.Sascha Haeberling2013-08-224-21/+50
|\| | | | | | | | | | | | | | * commit 'e2fb9943fb2d5a51a651f138d88473bf7f62e0b9': Proper I18N of the Details dialog, especially for RTL.
| * | Proper I18N of the Details dialog, especially for RTL.Sascha Haeberling2013-08-224-21/+50
| |/ | | | | | | | | | | Bug: 7141309 Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b
* | am 00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." ↵Sascha Haeberling2013-08-222-9/+10
|\| | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '00373f8a411042964f019a6355864a4c25fc2238': Speed up filmstrip by not decoding with default 3000px.
| * 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
* | | am ce2acbcb: Fix preview thumb orientationDoris Liu2013-08-222-7/+15
|\| | | | | | | | | | | | | | * commit 'ce2acbcb77225b6d429a23e00f69aadde8c2378b': Fix preview thumb orientation
| * | Fix preview thumb orientationDoris Liu2013-08-212-7/+15
| | | | | | | | | | | | | | | Bug: 10428123 Change-Id: I7c6f37db66d9e10a07f555902b214009156736c1
* | | am f737ac48: Merge "Add support to "go-to-next" in film strip." into ↵Angus Kong2013-08-224-39/+75
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'f737ac489200f12b6a48c4d0f7b63c0731eb8713': Add support to "go-to-next" in film strip.
| * | 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
* | | am 56f16746: Merge "Fix video capture animation and video snapshot ↵Doris Liu2013-08-223-462/+67
|\| | | | | | | | | | | | | | | | | | | | animation" into gb-ub-photos-carlsbad * commit '56f16746c8b3208e12134fb51843dde988cc79bc': Fix video capture animation and video snapshot animation
| * | 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
* | | am 15396ca6: Merge "Fix delete animation in fullscreen mode." into ↵Angus Kong2013-08-221-46/+16
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '15396ca68c47a4ef14e6b23c6cd009d8915f8ea2': Fix delete animation in fullscreen mode.
| * | 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
* | | | am 7e374eb0: Stop the MediaSaveService after unbinding.Angus Kong2013-08-221-8/+6
|\| | | | | | | | | | | | | | | | | | | * commit '7e374eb0a450ed2689b556ab42a0a88c8f74df2e': Stop the MediaSaveService after unbinding.
| * | | Stop the MediaSaveService after unbinding.Angus Kong2013-08-211-8/+6
| |/ / | | | | | | | | | | | | | | | bug:10361258 Change-Id: Ie1dc3caac03f7a691aae0c84c468bfb21ce6ae90
* | | am 025136bb: Support filmstrip swipe in full-screen.Angus Kong2013-08-221-21/+63
|\| | | | | | | | | | | | | | * commit '025136bb4639d84b2a5a7b95367fabcc92b86415': Support filmstrip swipe in full-screen.
| * | Support filmstrip swipe in full-screen.Angus Kong2013-08-211-21/+63
| | | | | | | | | | | | | | | | | | bug:10341731 Change-Id: Ib4a3278f72d3e1070603d2a094f4021a947bdc56
* | | am 87025351: Merge "Update the final PhotoSphere result correctly." into ↵Angus Kong2013-08-221-202/+230
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '870253516ce315888ac64e1921285e47154a75e7': Update the final PhotoSphere result correctly.
| * | 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
* | | am 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into ↵Doris Liu2013-08-221-0/+2
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '304a6360c3b710a4a5781788b887ca479646c86f': Fix nav bar overlapping camera bottom UI controls
| * | 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
* | | | am b5ca24e7: Merge "Remove the "button" part of the shutter button ↵Sascha Haeberling2013-08-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | description." into gb-ub-photos-carlsbad * commit 'b5ca24e7ce3aa1e3511f0bdf871fd7e41c247027': Remove the "button" part of the shutter button description.
| * | | 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
* | | | | am d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbadDoris Liu2013-08-222-2/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7e01e25dab83af2fe093d73f8f5f705f1a27305': Fix video snapshot aspect ratio
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 11:51:34 +0000