Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |||||
* | | | | Merge "Add secure camera support." into gb-ub-photos-carlsbad | Angus Kong | 2013-06-04 | 3 | -42/+139 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Add secure camera support. | Angus Kong | 2013-06-03 | 3 | -42/+139 | |
| | |/ | |/| | | | | | | | Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c | |||||
* | | | Merge "Fixes save filename for panos after edit." into gb-ub-photos-carlsbad | Ruben Brunk | 2013-06-03 | 1 | -3/+36 | |
|\ \ \ | ||||||
| * | | | Fixes save filename for panos after edit. | Ruben Brunk | 2013-06-03 | 1 | -3/+36 | |
| |/ / | | | | | | | | | | | | | Bug: 9258209 Change-Id: Ib7404242e5886a38b9e6f9fd6f28a52f1a703590 | |||||
* / / | Add play icon for videos. | Angus Kong | 2013-06-03 | 1 | -6/+22 | |
|/ / | | | | | | | Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd | |||||
* | | am 8bb4e1a0: Fixes reading exif tags in editor. | Ruben Brunk | 2013-06-03 | 1 | -1/+1 | |
|\ \ | |/ |/| | | | | | * commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9': Fixes reading exif tags in editor. | |||||
| * | Fixes reading exif tags in editor. | Ruben Brunk | 2013-06-03 | 1 | -1/+1 | |
| | | | | | | | | | | Bug: 9140401 Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6 | |||||
* | | Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbad | ztenghui | 2013-06-03 | 2 | -6/+9 | |
|\ \ | ||||||
| * | | Add LUT3D filter state saving | ztenghui | 2013-05-31 | 2 | -6/+9 | |
| | | | | | | | | | | | | Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018 | |||||
* | | | Merge "Add recent changes to new photo module" into gb-ub-photos-carlsbad | Doris Liu | 2013-06-03 | 7 | -77/+73 | |
|\ \ \ | ||||||
| * | | | Add recent changes to new photo module | Doris Liu | 2013-05-31 | 7 | -77/+73 | |
| | | | | | | | | | | | | | | | | Change-Id: Icd29a41e1564094e4feafd6c4d4c809f6253753d | |||||
* | | | | Add newly taken photos/videos to film strip. | Angus Kong | 2013-05-31 | 4 | -4/+61 | |
|/ / / | | | | | | | | | | Change-Id: I82d9e83d0a45f14036a194cf1ad5793b436357cd | |||||
* | | | Merge "Adjust data id even if it's not currently used." into ↵ | Angus Kong | 2013-05-31 | 1 | -5/+11 | |
|\ \ \ | | | | | | | | | | | | | gb-ub-photos-carlsbad | |||||
| * | | | Adjust data id even if it's not currently used. | Angus Kong | 2013-05-30 | 1 | -5/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | FilmStripView should adjust the internal info of data id after removal regardless of the existence of the removed data in the buffer. Change-Id: I78202997525a96a88f7bba8e0d55b7f6aad2c9cf | |||||
* | | | | Improve gesture handling | Doris Liu | 2013-05-31 | 9 | -237/+137 | |
| | | | | | | | | | | | | | | | | Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98 | |||||
* | | | | Merge "Translate the first/last view too." into gb-ub-photos-carlsbad | Angus Kong | 2013-05-31 | 1 | -5/+9 | |
|\ \ \ \ | ||||||
| * | | | | Translate the first/last view too. | Angus Kong | 2013-05-30 | 1 | -5/+9 | |
| |/ / / | | | | | | | | | | | | | Change-Id: Iea6dfa8acc632596fdf05001b6b11d11d014a8a0 | |||||
* | | | | Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbad | Angus Kong | 2013-05-31 | 1 | -1/+2 | |
|\ \ \ \ | ||||||
| * | | | | Don't use the same drawable for every view. | Angus Kong | 2013-05-30 | 1 | -1/+2 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | The placeholder drawable should be cloned for each view using it. Change-Id: Ic9f7614cc91c95a16105b3b8a9e07c81a8f1a2d7 | |||||
* | | | | Merge "Fix mistakenly reversed order in FilmStripView." into ↵ | Angus Kong | 2013-05-31 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad |