summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryceMichael Kolb2013-05-168-0/+0
|\
| * Add new overlay icons for sharpen and curvesMichael Kolb2013-05-168-0/+0
| | | | | | | | | | | | Bug: 8791729 Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b
* | Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-165-10/+14
|\ \
| * | toUpper() some stringsJohn Reck2013-05-165-10/+14
| |/ | | | | | | | | | | Bug: 8791729 Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
* | Merge "Fix reset" into gb-ub-photos-bryceJohn Reck2013-05-161-0/+1
|\ \
| * | Fix resetJohn Reck2013-05-151-0/+1
| |/ | | | | | | | | | | Bug: 8791729 Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec
* / change edit iconJohn Hoford2013-05-164-1/+1
|/ | | | | bug:8988179 Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0
* 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
* | | Merge "Pause face detection when review captured images" into gb-ub-photos-bryceDoris Liu2013-05-141-0/+2
|\ \ \ | |_|/ |/| |
| * | Pause face detection when review captured imagesDoris Liu2013-05-141-0/+2
| | | | | | | | | | | | | | | Bug: 8799508 Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
* | | Only link librsjni in unbundled branches.Tim Murray2013-05-131-1/+1
|/ / | | | | | | | | | | bug 8939828 Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a
* | Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
|\ \ | |/ |/|
| * New count down beeps.Doris Liu2013-05-132-0/+0
| | | | | | | | | | Bug: 8872947 Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a
* | Remove GL dependency on unused stencil buffers.George Mount2013-05-096-263/+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-087-24/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add drop shadow to preview thumbMichael Kolb2013-05-087-24/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | 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-0845-279/+203
|\ \ \ | |_|/ |/| |
| * | Fix second level menuMichael Kolb2013-05-0845-279/+203
| |/ | | | | | | | | | | | | | | Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
* | Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryceAngus Kong2013-05-0821-299/+0
|\ \
| * | DO NOT MERGE Further assets clean up.Angus Kong2013-05-0821-299/+0
| |/ | | | | | | | | | | | | Remove unused assets and layouts. bug:8656481 Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
* | 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 "Remove unused assets" into gb-ub-photos-bryceMichael Kolb2013-05-08183-0/+0
|\ \ \ | |_|/ |/| |
| * | Remove unused assetsMichael Kolb2013-05-07183-0/+0
| |/ | | | | | | | | | | Bug: 8656481 Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
* | 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 "Fix black background on save progress indicator." into gb-ub-photos-bryceGeorge Mount2013-05-061-1/+1
|\
| * Fix black background on save progress indicator.George Mount2013-05-061-1/+1
| | | | | | | | | | | | Bug 8802092 Change-Id: I40075ba6af69895a88973d906436c6e235c733fa
* | Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryceMichael Kolb2013-05-064-65/+75
|\ \
| * | Fix lockscreen camera widget layoutMichael Kolb2013-05-064-65/+75
| | | | | | | | | | | | | | | | | | Bug: 8832891 Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-13 21:11:42 +0000