summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* refactoring to make Editor classes do moreJohn Hoford2013-03-118-112/+190
| | | | Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9
* Add tiled backgroundnicolasroard2013-03-117-159/+172
| | | | Change-Id: I52292f6cae4f1121795829663dc4738cb38a953b
* Clear border resources to save memorynicolasroard2013-03-091-6/+0
| | | | Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2
* Merge "Memory usage improvements, speed improvement - free filters resources ↵nicolasroard2013-03-093-13/+100
|\ | | | | | | agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce
| * Memory usage improvements, speed improvementnicolasroard2013-03-083-13/+100
| | | | | | | | | | | | | | | | - free filters resources agressively - implements multiple rendering pipelines - some cleanup Change-Id: Ib9ed268b0b2662d0bf5c049adcf046b556954c37
* | Add sharing supportBobby Georgescu2013-03-081-0/+7
|/ | | | Change-Id: I2c7f18b0d6dd057c1fba96c1133d563f32abf55c
* Album set shimBobby Georgescu2013-03-071-0/+2
| | | | Change-Id: I12257ea09b7b5bc4b1d5ef638e685c66df86538a
* Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-03-0715-30/+15
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-03-0615-30/+15
| | | | | | | | | | Change-Id: Ie62ac98733f3baad857d0b1e7ebc4b6898b7c10f Auto-generated-cl: translation import
* | Merge "Data provider shim" into gb-ub-photos-bryceJohn Reck2013-03-072-2/+15
|\ \
| * | Data provider shimJohn Reck2013-03-062-2/+15
| | | | | | | | | | | | | | | | | | | | | Bolt the new UI framework on top of the old data model temporarily to unblock UI work Change-Id: I2f61f70647faca1f6a95b1f02f719ec4277fa5fb
* | | Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryceBobby Georgescu2013-03-063-1/+71
|\ \ \ | |_|/ |/| |
| * | Preliminary AlbumSet UIBobby Georgescu2013-03-053-1/+71
| | | | | | | | | | | | Change-Id: Ie99bd2939bfcb47c80605cbb22b84b1064098e91
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-03-0648-48/+63
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-03-0448-48/+63
| | | | | | | | | | | | | | | | | | | | Change-Id: Id6aba0c7b2d7a9efe94a6f5cd15c146f58b45e13 Auto-generated-cl: translation import
* | | | Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryceDoris Liu2013-03-063-3/+5
|\ \ \ \
| * | | | Add a black bar symmetric to nav barDoris Liu2013-03-053-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Also fix bug: 8323926 Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
* | | | | Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryceDoris Liu2013-03-063-58/+34
|\| | | | | |_|/ / |/| | |
| * | | Keep camera controls on the same physical sideDoris Liu2013-03-053-58/+34
| | | | | | | | | | | | | | | | Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
* | | | Improves visual historynicolasroard2013-03-051-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
* | | | Visual Historynicolasroard2013-03-052-29/+29
|/ / / | | | | | | | | | Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
* | / Improves state/history panel behaviournicolasroard2013-03-041-45/+45
| |/ |/| | | | | Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68
* | Merge "UI cleanup" into gb-ub-photos-brycenicolasroard2013-03-054-3/+7
|\ \
| * | UI cleanupnicolasroard2013-03-044-3/+7
| | | | | | | | | | | | Change-Id: Iaf138455651511e610b640a716820bd846284948
* | | Merge "Update PhotoProvider and tests to allow tests to run against ↵George Mount2013-03-041-0/+2
|\ \ \ | |/ / |/| | | | | GalleryGoogle.apk" into gb-ub-photos-bryce
| * | Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apkGeorge Mount2013-03-041-0/+2
| |/ | | | | | | Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c
* | Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryceDoris Liu2013-03-0418-343/+119
|\ \ | |/ |/|
| * Flatten view hierarchy and rotate viewsDoris Liu2013-03-0418-343/+119
| | | | | | | | | | | | | | | | | | 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
* | Improves State panel and Refactor FilterShowActivitynicolasroard2013-03-015-30/+411
| | | | | | | | | | | | | | | | - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2
* | fix importsJohn Hoford2013-03-012-2/+0
| | | | | | | | Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7
* | Merge "Add full screen image view" into gb-ub-photos-bryceJohn Reck2013-03-011-0/+2
|\ \
| * | Add full screen image viewJohn Reck2013-03-011-0/+2
| | | | | | | | | | | | Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4
* | | Import translations. DO NOT MERGEBaligh Uddin2013-03-017-13/+7
|/ / | | | | | | | | Change-Id: If43bbaaf4c504da6aa0031b5f1e81bd1c90afa26 Auto-generated-cl: translation import
* | Revert "Cleanup ImagePreset"Nicolas Roard2013-02-281-53/+69
| | | | | | | | | | | | This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01 Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
* | Cleanup ImagePresetnicolasroard2013-02-271-69/+53
| | | | | | | | Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e
* | Fix scale and full res previewnicolasroard2013-02-271-1/+1
| | | | | | | | Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d
* | Merge "refactor the geometry code" into gb-ub-photos-bryceJohn Hoford2013-02-284-60/+45
|\ \ | |/ |/|
| * refactor the geometry codeJohn Hoford2013-02-274-60/+45
| | | | | | | | Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
* | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-02-2748-178/+89
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-02-2748-178/+89
| |/ | | | | | | | | Change-Id: Ib435e397fb94039d4a4cc4da66ae4afcc198dac2 Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBaligh Uddin2013-02-2747-376/+188
|/ | | | | Change-Id: Id252293b9f782ee6744738fe20fc86230a898fb8 Auto-generated-cl: translation import
* Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryceJohn Reck2013-02-271-1/+1
|\
| * Thumbnails for PhotoSetPageJohn Reck2013-02-261-1/+1
| | | | | | | | Change-Id: I8d62b4ca0d0902ca2a18b087a344d35d17a97fa7
* | FilterShowActivity cleanupnicolasroard2013-02-261-6/+0
| | | | | | | | Change-Id: Iac674c6ca981b7dafb76af3602c75b925d4cbbed
* | Disable full res when dealing with jpeg orientationnicolasroard2013-02-261-0/+3
| | | | | | | | Change-Id: Ie29f25addcb66a6c8a2effa2bfbf89155ce6465a
* | Merge "Fix crash on applying borders" into gb-ub-photos-brycenicolasroard2013-02-261-0/+3
|\ \
| * | Fix crash on applying bordersnicolasroard2013-02-251-0/+3
| |/ | | | | | | | | | | bug:8265497 Change-Id: I7e6b22cb7666fd3876119051552e34e91df894a2
* | Merge "Use cross fade rotation animation" into gb-ub-photos-bryceMichael Kolb2013-02-261-0/+1
|\ \
| * | Use cross fade rotation animationMichael Kolb2013-02-251-0/+1
| |/ | | | | | | | | | | Bug: 8257846 Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
* / Fixed more of filtershows large bitmap reference leaks.Ruben Brunk2013-02-251-1/+0
|/ | | | | Bug: 8253109 Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772