Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Add support for importing videos in MTP importer | Bobby Georgescu | 2013-06-19 | 3 | -9/+40 | |
| |/ / | | | | | | | | | | | | | | | | Bug: 4099088 Change-Id: Ic3ac00cb730381dd2d7f4802aa8001a60e439748 | |||||
* | | | Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbad | ztenghui | 2013-06-19 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | Fix LUT3D information lost after re-edit | ztenghui | 2013-06-19 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | bug:9427243 Change-Id: I8535c8776c866fd6c84d391a8de82df9cb214694 | |||||
* | | | | Merge "Setup the saving framework to support hiding original photo for ↵ | ztenghui | 2013-06-19 | 5 | -63/+274 | |
|\ \ \ \ | | | | | | | | | | | | | | | | editor." into gb-ub-photos-carlsbad | |||||
| * | | | | Setup the saving framework to support hiding original photo for editor. | ztenghui | 2013-06-19 | 5 | -63/+274 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new approach will try to hide the original image into an auxiliary directory. User will only see one edited image, while being able to go back to the original image in the editor. Refactor SaveCopyTask for more private funcs and more comments. bug:9468909 Change-Id: I866321d23e6db0b3dbd08fec2a6a7e3142b17b65 | |||||
* | / / | Add flash animation to photo module | Doris Liu | 2013-06-19 | 2 | -11/+46 | |
| |/ / |/| | | | | | | | | Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652 | |||||
* | | | Set window flags to show secure camera | Doris Liu | 2013-06-18 | 1 | -9/+24 | |
| | | | | | | | | | | | | Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74 | |||||
* | | | Merge "Switch over to use new camera activity" into gb-ub-photos-carlsbad | Doris Liu | 2013-06-18 | 25 | -9693/+1137 | |
|\ \ \ | ||||||
| * | | | Switch over to use new camera activity | Doris Liu | 2013-06-18 | 25 | -9693/+1137 | |
| | | | | | | | | | | | | | | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0 | |||||
* | | | | Merge "Add decoding to a smaller image by sampling and scaling." into ↵ | George Mount | 2013-06-18 | 1 | -6/+63 | |
|\ \ \ \ | |/ / / |/| | | | | | | | gb-ub-photos-carlsbad | |||||
| * | | | Add decoding to a smaller image by sampling and scaling. | George Mount | 2013-06-17 | 1 | -6/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows opportunistic reuse of bitmaps, but does not require it when downsampling. Change-Id: I06f12bb5416f88a242f67bff3d2ca45894101bcd | |||||
* | | | | Add more metrics to Editor | Bobby Georgescu | 2013-06-17 | 4 | -0/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9467671 Instrument - Editor opened - Number of filters used in save - Undo/redo/reset/state panel - Save completed Change-Id: I4722f36496ccd089829bd616f89d760078922573 | |||||
* | | | | Added serialization IDs for frames, adds frames to analytics. | Ruben Brunk | 2013-06-17 | 3 | -19/+67 | |
| | | | | | | | | | | | | | | | | | | | | Bug: 9467671 Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb | |||||
* | | | | Merge "Remove files actually." into gb-ub-photos-carlsbad | Angus Kong | 2013-06-17 | 4 | -41/+174 | |
|\ \ \ \ | ||||||
| * | | | | Remove files actually. | Angus Kong | 2013-06-14 | 4 | -41/+174 | |
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e | |||||
* | | | | | Fix IDs for analytics, unlocalize serialization IDs. | Ruben Brunk | 2013-06-17 | 3 | -3/+15 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Bug: 9467671 Bug: 9336168 Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed | |||||
* | | | | Merge "Add callbacks for switching to camera/filmstrip" into ↵ | Doris Liu | 2013-06-13 | 9 | -61/+57 | |
|\ \ \ \ | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad | |||||
| * | | | | Add callbacks for switching to camera/filmstrip | Doris Liu | 2013-06-13 | 9 | -61/+57 | |
| | | | | | | | | | | | | | | | | | | | | Change-Id: I936d59efe3e09232ab0b298603c823d4f7952199 | |||||
* | | | | | Merge "Refactor to separate out EGL part." into gb-ub-photos-carlsbad | Angus Kong | 2013-06-13 | 4 | -117/+260 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Refactor to separate out EGL part. | Angus Kong | 2013-06-12 | 4 | -117/+260 | |
| | | | | | | | | | | | | | | | | | | | | Change-Id: I90c37b9e221a80f0d35e6e12ab8850078dc03622 | |||||
* | | | | | Merge "Update camera orientation when device is flipped" into ↵ | Doris Liu | 2013-06-13 | 11 | -94/+142 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad | |||||
| * | | | | | Update camera orientation when device is flipped | Doris Liu | 2013-06-13 | 11 | -94/+142 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8963053 Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a | |||||
* | | | | | | Merge "fix start up crash" into gb-ub-photos-carlsbad | John Hoford | 2013-06-13 | 1 | -0/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix start up crash | John Hoford | 2013-06-13 | 1 | -0/+8 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:8734160 Change-Id: Iaf7f6bdbd70ab04011b9af7816a6991724363e49 | |||||
* | | | | | | Remove unused and buggy MtpThumbnailDrawable code | Bobby Georgescu | 2013-06-13 | 1 | -61/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8793065 Change-Id: Ib8b08ae8b9e08319f8628581d8e3c5a4688ee4a5 | |||||
* | | | | | | Merge "In carlesbad, fix image capture on S4" into gb-ub-photos-carlsbad | Doris Liu | 2013-06-12 | 1 | -0/+4 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | In carlesbad, fix image capture on S4 | Doris Liu | 2013-06-12 | 1 | -0/+4 | |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | Bug: 9390020 Change-Id: I9d7e0609c55f47a267aff8499dcd244dfb2fdb3a | |||||
* / | | | | Fix icon sizes and jaggies | nicolasroard | 2013-06-11 | 2 | -2/+2 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e | |||||
* | | | | Merge "Disable zoom when camera does not support zoom" into ↵ | Doris Liu | 2013-06-11 | 5 | -2/+19 | |
|\ \ \ \ | |/ / / |/| | | | | | | | gb-ub-photos-carlsbad | |||||
| * | | | Disable zoom when camera does not support zoom | Doris Liu | 2013-06-11 | 5 | -2/+19 | |
| | | | | | | | | | | | | | | | | Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0 | |||||
* | | | | Mirror CL 319301 in Bryce. | Ruben Brunk | 2013-06-11 | 1 | -20/+36 | |
| | | | | | | | | | | | | | | | | Change-Id: If84a08aa1969415a0d5d9ad3b9153743b1951108 | |||||
* | | | | Fix build. | Angus Kong | 2013-06-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Change-Id: I05f73596157fb5a2ee0ebf8581cfffa973a2d1d7 | |||||
* | | | | Use setPreviewFpsRange instead. | Angus Kong | 2013-06-11 | 3 | -5/+23 | |
| | | | | | | | | | | | | | | | | Change-Id: I58f6af667fd906221b67b8a4827d7a67c567e20a | |||||
* | | | | Fix panel anim in ICS | nicolasroard | 2013-06-10 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | Change-Id: Ie2e5a6a36c5bec309b5848e50a90f089f9aeffa9 | |||||
* | | | | Fix state panel text size | nicolasroard | 2013-06-10 | 1 | -0/+1 | |
| |_|/ |/| | | | | | | | | | | | | | | bug:9377153 Change-Id: Id5243539e2f8d3ee737e24eeb204145fbaa9138d | |||||
* | | | Fix warnings | nicolasroard | 2013-06-10 | 1 | -3/+3 | |
|/ / | | | | | | | Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8 | |||||
* | | Merge "Add enable/disable swiping to filmstrip" into gb-ub-photos-carlsbad | Doris Liu | 2013-06-07 | 7 | -11/+27 | |
|\ \ | |/ |/| | ||||||
| * | Add enable/disable swiping to filmstrip | Doris Liu | 2013-06-06 | 7 | -11/+27 | |
| | | | | | | | | Change-Id: I3e019764a72f947545cd230b9bfe45f67d83dc29 | |||||
* | | Fix NPE in PreparePageFadeoutTexture | Bobby Georgescu | 2013-06-07 | 1 | -0/+4 | |
|/ | | | | | Bug: 8837688 Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09 | |||||
* | Merge "Play video from flim strip." into gb-ub-photos-carlsbad | Angus Kong | 2013-06-05 | 5 | -26/+63 | |
|\ | ||||||
| * | Play video from flim strip. | Angus Kong | 2013-06-04 | 5 | -26/+63 | |
| | | | | | | | | Change-Id: Iaedf42d7dabee53f75a20c57f9e6916864ea271f | |||||
* | | Merge "Add interface for swipe checking." into gb-ub-photos-carlsbad | Angus Kong | 2013-06-05 | 3 | -0/+22 | |
|\ \ | ||||||
| * | | Add interface for swipe checking. | Angus Kong | 2013-06-05 | 3 | -0/+22 | |
| | | | | | | | | | | | | | | | | | | And fullscreen notification. Change-Id: Ib264904cca47f1fc90ae5e392f0672c253e4d833 | |||||
* | | | Merge "Fix graphical corruption due to tear down race" into ↵ | John Reck | 2013-06-05 | 1 | -0/+3 | |
|\ \ \ | |/ / |/| | | | | | gb-ub-photos-carlsbad | |||||
| * | | Fix graphical corruption due to tear down race | John Reck | 2013-06-05 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | Bug: 9278945 Change-Id: I7594680322768f60eaed8a1037d139cbadf9706b | |||||
* | | | Merge "Removing unused UI fields in FilterRepresentation." into ↵ | Ruben Brunk | 2013-06-05 | 27 | -95/+31 | |
|\ \ \ | |_|/ |/| | | | | | gb-ub-photos-carlsbad | |||||
| * | | Removing unused UI fields in FilterRepresentation. | Ruben Brunk | 2013-06-05 | 27 | -95/+31 | |
| | | | | | | | | | | | | | | | | | | Bug: 9170644 Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2 | |||||
* | | | Merge "Get new camera activity up to date" into gb-ub-photos-carlsbad | Doris Liu | 2013-06-04 | 6 | -178/+122 | |
|\ \ \ | ||||||
| * | | | Get new camera activity up to date | Doris Liu | 2013-06-03 | 6 | -178/+122 | |
| | | | | | | | | | | | | | | | | Change-Id: I24241bc6082052a1da90b9c41c3362af72e47b37 | |||||
* | | | | Fix pie menu button disappearing | Doris Liu | 2013-06-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Change-Id: Ia664ac3115849227848c465067a78ef3aaf445cb |