summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ | |_|/ |/| |
| * | Fix second level menuMichael Kolb2013-05-084-158/+102
| |/ | | | | | | | | | | | | | | Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
* | Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryceBobby Georgescu2013-05-081-0/+2
|\ \ | |/ |/|
| * Fix memory leak in SparseArrayBitmapPoolBobby Georgescu2013-05-071-0/+2
| | | | | | | | | | Bug: 8857493 Change-Id: Ie5fae457aea91973caa07f8955b1364df573821b
* | Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryceDoris Liu2013-05-084-2/+14
|\ \
| * | Fix video capture intent overlapping buttonsDoris Liu2013-05-074-2/+14
| | | | | | | | | | | | | | | Bug: 8839010 Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
* | | Merge "Add animation to slice selection" into gb-ub-photos-bryceMichael Kolb2013-05-081-1/+47
|\ \ \ | |_|/ |/| |
| * | Add animation to slice selectionMichael Kolb2013-05-071-1/+47
| |/ | | | | | | | | | | Bug: 8826233 Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
* | Merge "Avoid rounding errors from cropping uncropped images." into ↵Sascha Haeberling2013-05-072-3/+27
|\ \ | |/ |/| | | gb-ub-photos-bryce
| * Avoid rounding errors from cropping uncropped images.Sascha Haeberling2013-05-072-3/+27
| | | | | | | | | | | | | | | | Bug: 8736111 Also don't treat "none" as a non-modifying filter. Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
* | Fix review button placementMichael Kolb2013-05-071-53/+66
| | | | | | | | | | | | Bug: 8833788 Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
* | Resize children to avoid laying out outside parentDoris Liu2013-05-061-16/+32
|/ | | | | Bug: 8838983 Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
* Merge "Restrict checking for device flip" into gb-ub-photos-bryceDoris Liu2013-05-062-7/+20
|\
| * Restrict checking for device flipDoris Liu2013-05-032-7/+20
| | | | | | | | | | Bug: 8714114 Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
* | Set correct label text in tap modeMichael Kolb2013-05-061-0/+1
| | | | | | | | | | | | Bug: 8826229 Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
* | Fix NPE caused by insets never being setDoris Liu2013-05-031-6/+8
|/ | | | | Bug: 8804054 Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
* Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryceDoris Liu2013-05-032-68/+124
|\
| * Anchor camera controls when flipping deviceDoris Liu2013-05-032-68/+124
| | | | | | | | | | | | | | | | Also adjusted margins for camera root view to avoid covering undo bar Bug: 8758513 Bug: 8714114 Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
* | Don't show settings when popup is shown.Angus Kong2013-05-021-0/+1
|/ | | | | bug:8771618 Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
* Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryceGeorge Mount2013-05-022-3/+149
|\ | | | | | | | | | | * changes: Class to simplify use of GalleryBitmapPool for decoding Bitmaps. Allow prefetch for cache, reducing priority for prefetched images.
| * Class to simplify use of GalleryBitmapPool for decoding Bitmaps.George Mount2013-05-021-0/+122
| | | | | | | | | | | | | | Bug 8446191 Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63 Change-Id: Ia9b2ced0bfd9c9c1b969c77bc89eaa0fa87687bb
| * Allow prefetch for cache, reducing priority for prefetched images.George Mount2013-05-021-3/+27
| | | | | | | | | | | | | | Bug 8446191 Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63 Change-Id: I7cccfffc539988d26fc751e16726b05fb2ba21bd