summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Switch over to use new camera activityDoris Liu2013-06-1824-9688/+1137
| | | | | | | | | | | | | | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* | | | Merge "Add decoding to a smaller image by sampling and scaling." into ↵George Mount2013-06-181-6/+63
|\ \ \ \ | |/ / / |/| | | | | | | gb-ub-photos-carlsbad
| * | | Add decoding to a smaller image by sampling and scaling.George Mount2013-06-171-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows opportunistic reuse of bitmaps, but does not require it when downsampling. Change-Id: I06f12bb5416f88a242f67bff3d2ca45894101bcd
* | | | Add more metrics to EditorBobby Georgescu2013-06-173-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Brunk2013-06-172-2/+4
| | | | | | | | | | | | | | | | | | | | Bug: 9467671 Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
* | | | Merge "Remove files actually." into gb-ub-photos-carlsbadAngus Kong2013-06-174-41/+174
|\ \ \ \
| * | | | Remove files actually.Angus Kong2013-06-144-41/+174
| | | | | | | | | | | | | | | | | | | | Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e
* | | | | Fix IDs for analytics, unlocalize serialization IDs.Ruben Brunk2013-06-173-3/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 9467671 Bug: 9336168 Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed
* | | | Merge "Add callbacks for switching to camera/filmstrip" into ↵Doris Liu2013-06-139-61/+57
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | | Add callbacks for switching to camera/filmstripDoris Liu2013-06-139-61/+57
| | | | | | | | | | | | | | | | | | | | Change-Id: I936d59efe3e09232ab0b298603c823d4f7952199
* | | | | Merge "Refactor to separate out EGL part." into gb-ub-photos-carlsbadAngus Kong2013-06-133-117/+255
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactor to separate out EGL part.Angus Kong2013-06-123-117/+255
| | | | | | | | | | | | | | | | | | | | Change-Id: I90c37b9e221a80f0d35e6e12ab8850078dc03622
* | | | | Merge "Update camera orientation when device is flipped" into ↵Doris Liu2013-06-1311-94/+142
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | | | Update camera orientation when device is flippedDoris Liu2013-06-1311-94/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8963053 Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a
* | | | | | Merge "fix start up crash" into gb-ub-photos-carlsbadJohn Hoford2013-06-131-0/+8
|\ \ \ \ \ \
| * | | | | | fix start up crashJohn Hoford2013-06-131-0/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:8734160 Change-Id: Iaf7f6bdbd70ab04011b9af7816a6991724363e49
* | | | | | Remove unused and buggy MtpThumbnailDrawable codeBobby Georgescu2013-06-131-61/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8793065 Change-Id: Ib8b08ae8b9e08319f8628581d8e3c5a4688ee4a5
* | | | | | Merge "In carlesbad, fix image capture on S4" into gb-ub-photos-carlsbadDoris Liu2013-06-121-0/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | In carlesbad, fix image capture on S4Doris Liu2013-06-121-0/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 9390020 Change-Id: I9d7e0609c55f47a267aff8499dcd244dfb2fdb3a
* / | | | Fix icon sizes and jaggiesnicolasroard2013-06-112-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
* | | | Merge "Disable zoom when camera does not support zoom" into ↵Doris Liu2013-06-115-2/+19
|\ \ \ \ | |/ / / |/| | | | | | | gb-ub-photos-carlsbad
| * | | Disable zoom when camera does not support zoomDoris Liu2013-06-115-2/+19
| | | | | | | | | | | | | | | | Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
* | | | Mirror CL 319301 in Bryce.Ruben Brunk2013-06-111-20/+36
| | | | | | | | | | | | | | | | Change-Id: If84a08aa1969415a0d5d9ad3b9153743b1951108
* | | | Fix build.Angus Kong2013-06-111-1/+1
| | | | | | | | | | | | | | | | Change-Id: I05f73596157fb5a2ee0ebf8581cfffa973a2d1d7
* | | | Use setPreviewFpsRange instead.Angus Kong2013-06-113-5/+23
| | | | | | | | | | | | | | | | Change-Id: I58f6af667fd906221b67b8a4827d7a67c567e20a
* | | | Fix panel anim in ICSnicolasroard2013-06-101-1/+6
| | | | | | | | | | | | | | | | Change-Id: Ie2e5a6a36c5bec309b5848e50a90f089f9aeffa9
* | | | Fix state panel text sizenicolasroard2013-06-101-0/+1
| |_|/ |/| | | | | | | | | | | | | | bug:9377153 Change-Id: Id5243539e2f8d3ee737e24eeb204145fbaa9138d
* | | Fix warningsnicolasroard2013-06-101-3/+3
|/ / | | | | | | Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
* | Merge "Add enable/disable swiping to filmstrip" into gb-ub-photos-carlsbadDoris Liu2013-06-077-11/+27
|\ \ | |/ |/|
| * Add enable/disable swiping to filmstripDoris Liu2013-06-067-11/+27
| | | | | | | | Change-Id: I3e019764a72f947545cd230b9bfe45f67d83dc29
* | Fix NPE in PreparePageFadeoutTextureBobby Georgescu2013-06-071-0/+4
|/ | | | | Bug: 8837688 Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09
* Merge "Play video from flim strip." into gb-ub-photos-carlsbadAngus Kong2013-06-055-26/+63
|\
| * Play video from flim strip.Angus Kong2013-06-045-26/+63
| | | | | | | | Change-Id: Iaedf42d7dabee53f75a20c57f9e6916864ea271f
* | Merge "Add interface for swipe checking." into gb-ub-photos-carlsbadAngus Kong2013-06-053-0/+22
|\ \
| * | Add interface for swipe checking.Angus Kong2013-06-053-0/+22
| | | | | | | | | | | | | | | | | | And fullscreen notification. Change-Id: Ib264904cca47f1fc90ae5e392f0672c253e4d833
* | | Merge "Fix graphical corruption due to tear down race" into ↵John Reck2013-06-051-0/+3
|\ \ \ | |/ / |/| | | | | gb-ub-photos-carlsbad
| * | Fix graphical corruption due to tear down raceJohn Reck2013-06-051-0/+3
| | | | | | | | | | | | | | | | | | Bug: 9278945 Change-Id: I7594680322768f60eaed8a1037d139cbadf9706b
* | | Merge "Removing unused UI fields in FilterRepresentation." into ↵Ruben Brunk2013-06-0527-95/+31
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-carlsbad
| * | Removing unused UI fields in FilterRepresentation.Ruben Brunk2013-06-0527-95/+31
| | | | | | | | | | | | | | | | | | Bug: 9170644 Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
* | | Merge "Get new camera activity up to date" into gb-ub-photos-carlsbadDoris Liu2013-06-046-178/+122
|\ \ \
| * | | Get new camera activity up to dateDoris Liu2013-06-036-178/+122
| | | | | | | | | | | | | | | | Change-Id: I24241bc6082052a1da90b9c41c3362af72e47b37
* | | | Fix pie menu button disappearingDoris Liu2013-06-031-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ia664ac3115849227848c465067a78ef3aaf445cb
* | | | Merge "Add secure camera support." into gb-ub-photos-carlsbadAngus Kong2013-06-043-42/+139
|\ \ \ \ | |_|/ / |/| | |
| * | | Add secure camera support.Angus Kong2013-06-033-42/+139
| | |/ | |/| | | | | | | Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
* | | Merge "Fixes save filename for panos after edit." into gb-ub-photos-carlsbadRuben Brunk2013-06-031-3/+36
|\ \ \
| * | | Fixes save filename for panos after edit.Ruben Brunk2013-06-031-3/+36
| |/ / | | | | | | | | | | | | Bug: 9258209 Change-Id: Ib7404242e5886a38b9e6f9fd6f28a52f1a703590
* / / Add play icon for videos.Angus Kong2013-06-031-6/+22
|/ / | | | | | | Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd
* | am 8bb4e1a0: Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
|\ \ | |/ |/| | | | | * commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9': Fixes reading exif tags in editor.
| * Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
| | | | | | | | | | Bug: 9140401 Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
* | Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbadztenghui2013-06-032-6/+9
|\ \