summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "UI cleanup" into gb-ub-photos-brycenicolasroard2013-03-055-15/+29
|\
| * UI cleanupnicolasroard2013-03-045-15/+29
| | | | | | | | Change-Id: Iaf138455651511e610b640a716820bd846284948
* | Merge "Update PhotoProvider and tests to allow tests to run against ↵George Mount2013-03-048-277/+244
|\ \ | |/ |/| | | GalleryGoogle.apk" into gb-ub-photos-bryce
| * Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apkGeorge Mount2013-03-048-277/+244
| | | | | | | | Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c
* | Merge "Clean up comments" into gb-ub-photos-bryceBobby Georgescu2013-03-041-8/+0
|\ \
| * | Clean up commentsBobby Georgescu2013-03-041-8/+0
| | | | | | | | | | | | Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c
* | | Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryceDoris Liu2013-03-049-205/+285
|\ \ \ | |/ / |/| |
| * | Flatten view hierarchy and rotate viewsDoris Liu2013-03-049-205/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: SRI pano and Lightcycle can use a bit more flattening. I will get to them next. (Maybe in a different CL.) TODO: Need to cancel capture animation in onConfigurationChanged() Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
* | | Merge "Refactor AutoThumbnailDrawable, fix race conditions" into ↵Bobby Georgescu2013-03-024-54/+208
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-bryce
| * | Refactor AutoThumbnailDrawable, fix race conditionsBobby Georgescu2013-03-024-54/+208
| | | | | | | | | | | | Change-Id: I80243ee177387e0d9b309acb5a7c1d364cc73530
* | | Fix preview rendering speed...nicolasroard2013-03-012-1/+4
| | | | | | | | | | | | Change-Id: I6a6ba3c14a91d60446f28f5dce52fd3c4bc49f79
* | | Fix disappearing border thumbnailsnicolasroard2013-03-011-1/+1
| | | | | | | | | | | | Change-Id: I9ed43646a353658a590354f13e51dc96fa760442
* | | Improves State panel and Refactor FilterShowActivitynicolasroard2013-03-017-161/+360
| | | | | | | | | | | | | | | | | | | | | | | | - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2
* | | fix importsJohn Hoford2013-03-0131-77/+18
| | | | | | | | | | | | Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7
* | | Merge "Fix crash if a tile ends up with a width or height of 0" into ↵John Reck2013-03-011-2/+2
|\ \ \ | | | | | | | | | | | | gb-ub-photos-bryce
| * | | Fix crash if a tile ends up with a width or height of 0John Reck2013-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8242279 Change-Id: Id8f9d85b46f07fb5aea8063a081524b9a3d992ae
* | | | Merge "fixed hiding of tiny planet" into gb-ub-photos-bryceJohn Hoford2013-03-013-22/+20
|\ \ \ \ | |/ / / |/| | |
| * | | fixed hiding of tiny planetJohn Hoford2013-03-013-22/+20
| | | | | | | | | | | | | | | | Change-Id: I0d23a640cf4aee5ae03e6552637ba3663db85bde
* | | | Merge "Add full screen image view" into gb-ub-photos-bryceJohn Reck2013-03-016-2/+1597
|\ \ \ \ | |_|/ / |/| | |
| * | | Add full screen image viewJohn Reck2013-03-016-2/+1597
| |/ / | | | | | | | | | Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4
* / / Fix race conditionJohn Reck2013-03-011-4/+2
|/ / | | | | | | Change-Id: I6cf9207d067d4c0c3c4271d6ce6f44b213d7296b
* | Clarify threading, cleanup lockingJohn Reck2013-02-281-10/+18
| | | | | | | | | | | | Bug: 8285317 Change-Id: I8b1b0eda74a41f388e97fee6bcd4ce948bb6e15a
* | Fix for applied ratiosnicolasroard2013-02-284-8/+28
| | | | | | | | Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9
* | Fix crop rationicolasroard2013-02-281-9/+3
| | | | | | | | | | | | bug:8291961 Change-Id: Ia279c35115fbfc0774505bf3318b7fac7d84d2eb
* | Revert "Cleanup ImagePreset"Nicolas Roard2013-02-284-60/+74
| | | | | | | | | | | | This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01 Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
* | Cleanup ImagePresetnicolasroard2013-02-274-74/+60
| | | | | | | | Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e
* | crop fixJohn Hoford2013-02-274-25/+76
| | | | | | | | Change-Id: Ie2e79992bf45fffb0ae00c4a4fd879546fa1450f
* | Fix full res previewnicolasroard2013-02-271-1/+0
| | | | | | | | Change-Id: Ia727d06b9ff9866dfbb883968a23c0ed105e57fa
* | Fix scale and full res previewnicolasroard2013-02-272-2/+3
| | | | | | | | Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d
* | Merge "refactor the geometry code" into gb-ub-photos-bryceJohn Hoford2013-02-2822-93/+433
|\ \
| * | refactor the geometry codeJohn Hoford2013-02-2722-93/+433
| | | | | | | | | | | | Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
* | | Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryceJustin Koh2013-02-276-83/+399
|\ \ \ | |_|/ |/| |
| * | Updated Gallery2 with Pano.Justin Koh2013-02-276-83/+399
| |/ | | | | | | | | | | | | Updated Gallery2 with Pano. Bug: 8263808 Change-Id: Iedaba9dc478fb20480f3b37e9708bc8d67cf6003
* | Merge "Highlight menu selection better" into gb-ub-photos-bryceMichael Kolb2013-02-271-23/+73
|\ \ | |/ |/|
| * Highlight menu selection betterMichael Kolb2013-02-271-23/+73
| | | | | | | | | | | | | | Keep the selected slice highlighted longer before fading out Timing might need further adjusting Change-Id: I9c3febf4ad2b73f2c80d47259fa9cd7578445dd4
* | Fix vignette startup drawnicolasroard2013-02-261-5/+19
| | | | | | | | Change-Id: Ifaab3167e44db05be6c788e10d234975b1f51b56
* | Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryceJohn Reck2013-02-273-10/+1202
|\ \
| * | Thumbnails for PhotoSetPageJohn Reck2013-02-263-10/+1202
| | | | | | | | | | | | Change-Id: I8d62b4ca0d0902ca2a18b087a344d35d17a97fa7
* | | FilterShowActivity cleanupnicolasroard2013-02-262-104/+13
| | | | | | | | | | | | Change-Id: Iac674c6ca981b7dafb76af3602c75b925d4cbbed
* | | Merge "add upoint" into gb-ub-photos-bryceJohn Hoford2013-02-262-1/+22
|\ \ \
| * | | add upointJohn Hoford2013-02-262-1/+22
| |/ / | | | | | | | | | Change-Id: I484d2c6658e4ea06e22fa037ef2262c17b9e8d79
* | / Add initial implementation of PhotosProvider.George Mount2013-02-266-0/+1428
| |/ |/| | | | | Change-Id: I98694cf54bd0fb549703a7184e1816e9590a05ff
* | Disable full res when dealing with jpeg orientationnicolasroard2013-02-261-0/+3
| | | | | | | | Change-Id: Ie29f25addcb66a6c8a2effa2bfbf89155ce6465a
* | Fix compare swipenicolasroard2013-02-251-11/+15
| | | | | | | | bug:8266511
* | Merge "Fix crash on applying borders" into gb-ub-photos-brycenicolasroard2013-02-263-3/+8
|\ \
| * | Fix crash on applying bordersnicolasroard2013-02-253-3/+8
| |/ | | | | | | | | | | bug:8265497 Change-Id: I7e6b22cb7666fd3876119051552e34e91df894a2
* | Merge "Use cross fade rotation animation" into gb-ub-photos-bryceMichael Kolb2013-02-262-2/+31
|\ \
| * | Use cross fade rotation animationMichael Kolb2013-02-252-2/+31
| |/ | | | | | | | | | | Bug: 8257846 Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
* / Fixed more of filtershows large bitmap reference leaks.Ruben Brunk2013-02-256-45/+44
|/ | | | | Bug: 8253109 Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772
* Merge "Release surface texture to fix gray camera preview" into ↵Doris Liu2013-02-231-4/+3
|\ | | | | | | gb-ub-photos-bryce