summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
| | | | | Bug: 9140401 Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
* Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-301-2/+23
|\
| * Add HTC One picture resolutionsMichael Kolb2013-05-301-2/+23
| | | | | | | | | | | | | | | | Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
* | Dismiss settings when showing popup in Video mode.Angus Kong2013-05-291-0/+1
| | | | | | | | | | bug:8771618 Change-Id: I889b794c6732b674e26436f950e81f67529012e7
* | Merge "Change the order of exposure compensation" into gb-ub-photos-bryceDoris Liu2013-05-281-4/+4
|\ \
| * | Change the order of exposure compensationDoris Liu2013-05-241-4/+4
| |/ | | | | | | | | Bug: 9119379 Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
* | Merge "Prevent lock screen appearing during active slideshow" into ↵Bobby Georgescu2013-05-281-2/+1
|\ \ | |/ |/| | | gb-ub-photos-bryce
| * Prevent lock screen appearing during active slideshowBobby Georgescu2013-05-241-2/+1
| | | | | | | | | | Bug: 9094678 Change-Id: I8efb988911c75275430da934474df1e65265b234
* | Fix issues with LocalJohn Hoford2013-05-221-0/+1
| | | | | | | | | | bug:9085638 Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
* | Merge "fix ellipse logic for portrait" into gb-ub-photos-bryceJohn Hoford2013-05-221-4/+21
|\ \
| * | fix ellipse logic for portraitJohn Hoford2013-05-211-4/+21
| | | | | | | | | | | | | | | bug:9054114 Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec
* | | Merge "Fix potential synchronization issue in bitmap pool" into ↵Bobby Georgescu2013-05-221-2/+2
|\ \ \ | | | | | | | | | | | | gb-ub-photos-bryce
| * | | Fix potential synchronization issue in bitmap poolBobby Georgescu2013-05-211-2/+2
| | |/ | |/| | | | | | | | | | | | | Bug: 9072712 Change-Id: I7fcecd6ec63e461e06a6565519be6d86e3246155
* | | Fix editor on ICSMichael Kolb2013-05-221-1/+1
| |/ |/| | | | | | | | | Bug: 9079902 Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14
* | Merge "Fix selection highlight for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-212-2/+25
|\ \
| * | Fix selection highlight for tabletsMichael Kolb2013-05-212-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 9044356 Fixes selection highlight for the new asset sizes. Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a
* | | Merge "Fix height" into gb-ub-photos-bryceJohn Reck2013-05-211-1/+2
|\ \ \
| * | | Fix heightJohn Reck2013-05-211-1/+2
| | |/ | |/| | | | | | | Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
* / | Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-213-1/+37
|/ / | | | | | | | | | | | | | | Bug: 9054122 Also make gotoGallery public for LightCycle to use. Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc
* | Merge "Fix camera controls blink on startup" into gb-ub-photos-bryceDoris Liu2013-05-211-0/+5
|\ \
| * | Fix camera controls blink on startupDoris Liu2013-05-201-0/+5
| |/ | | | | | | | | Bug: 9052837 Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
* / fix TinyPlanets Filter landscape crashJohn Hoford2013-05-201-1/+5
|/ | | | | bug:9038163 Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
* Merge "Avoid using region decoder for bad image types when setting ↵Ruben Brunk2013-05-201-26/+50
|\ | | | | | | wallpaper." into gb-ub-photos-bryce
| * Avoid using region decoder for bad image types when setting wallpaper.Ruben Brunk2013-05-201-26/+50
| | | | | | | | | | Bug: 8893617 Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe
* | Merge "Make sure canceling a filter does not undo previous filter." into ↵Sascha Haeberling2013-05-201-18/+2
|\ \ | |/ |/| | | gb-ub-photos-bryce
| * Make sure canceling a filter does not undo previous filter.Sascha Haeberling2013-05-081-18/+2
| | | | | | | | | | | | Bug: 8770921 Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
* | Merge "Disable zoom" into gb-ub-photos-bryceJohn Hoford2013-05-201-1/+15
|\ \
| * | Disable zoomJohn Hoford2013-05-171-1/+15
| | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
* | | Highlight selected option in FX and BordersMichael Kolb2013-05-176-13/+142
|/ / | | | | | | | | | | Bug: 8791729 Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
* | Switch back to old cropJohn Reck2013-05-161-3/+2
| | | | | | | | | | | | Bug: 8950255 Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed
* | Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-163-8/+10
|\ \
| * | toUpper() some stringsJohn Reck2013-05-163-8/+10
| | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
* | | Fix resetJohn Reck2013-05-151-0/+1
|/ / | | | | | | | | | | Bug: 8791729 Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec
* | Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryceMichael Kolb2013-05-151-3/+12
|\ \
| * | Grey out undo/redo/reset according to stateMichael Kolb2013-05-141-3/+12
| | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827
* | | Merge "Correct label position after rotation" into gb-ub-photos-bryceMichael Kolb2013-05-151-1/+1
|\ \ \
| * | | Correct label position after rotationMichael Kolb2013-05-141-1/+1
| |/ / | | | | | | | | | | | | | | | Bug: 8963421 Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3
* | | Merge "Fix another annoying warning log spam" into gb-ub-photos-bryceztenghui2013-05-151-0/+8
|\ \ \
| * | | Fix another annoying warning log spamztenghui2013-05-131-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | bug:8771541 When we set up the icon rendering, we need to set the geometry, too. Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92
* / / Pause face detection when review captured imagesDoris Liu2013-05-141-0/+2
|/ / | | | | | | | | Bug: 8799508 Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
* | Remove GL dependency on unused stencil buffers.George Mount2013-05-095-248/+5
| | | | | | | | | | | | Bug 8884435 Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34
* | Merge "Fix the verbose log" into gb-ub-photos-bryceztenghui2013-05-091-3/+8
|\ \
| * | Fix the verbose logztenghui2013-05-081-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging. bug:8771541 Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
* | | Merge "Close menu in onPause" into gb-ub-photos-bryceBart Sears2013-05-091-0/+1
|\ \ \
| * | | Close menu in onPauseMichael Kolb2013-05-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8722672 Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
* | | | Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryceMichael Kolb2013-05-083-24/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add drop shadow to preview thumbMichael Kolb2013-05-083-24/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | Bug: 8826241 Also, remove animateSlide blocker, it caused frozen review Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
* | | Merge "Reduce max size of bitmap returned by crop dialog." into ↵Sascha Haeberling2013-05-081-1/+8
|\ \ \ | |/ / |/| | | | | gb-ub-photos-bryce
| * | Reduce max size of bitmap returned by crop dialog.Sascha Haeberling2013-05-081-1/+8
| | | | | | | | | | | | | | | | | | Bug: 8851336 Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6
* | | Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-084-158/+102
|\ \ \ | |_|/ |/| |