summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-09-1456-2/+100
| | | | | Change-Id: If399feec49a2313053cbbed4c58f1be505b82185 Auto-generated-cl: translation import
* am bbd867a0: am 4f05d51f: am edf4b095: Fix various UX bugsnicolasroard2013-09-138-23/+123
|\ | | | | | | | | * commit 'bbd867a08ad42b28b2b5840b3aea641a2aa70e01': Fix various UX bugs
| * am 4f05d51f: am edf4b095: Fix various UX bugsnicolasroard2013-09-138-23/+123
| |\ | | | | | | | | | | | | * commit '4f05d51f2bb51ff545a944b9314a6ea76dea029b': Fix various UX bugs
| | * am edf4b095: Fix various UX bugsnicolasroard2013-09-138-23/+123
| | |\ | | | | | | | | | | | | | | | | * commit 'edf4b095a1d904df6c02d49e3ec575c5c3c9c749': Fix various UX bugs
| | | * Fix various UX bugsnicolasroard2013-09-138-23/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - boolean filters (invert) working - default value for vignette - swappable views un-broken (use same mechanism as categories views) Change-Id: I65818c1febbf2c862e97542c8134a1188daf5d62
* | | | am 813df7cf: am 74e981f3: am bae1c102: remove an Icon change that introduced ↵John Hoford2013-09-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | a bug * commit '813df7cf8860432b489f1e83575091f71bcd0d1f': remove an Icon change that introduced a bug
| * | | am 74e981f3: am bae1c102: remove an Icon change that introduced a bugJohn Hoford2013-09-131-1/+1
| |\| | | | | | | | | | | | | | | | | | * commit '74e981f38ac8e35814343eecaf571d1e7e5ea544': remove an Icon change that introduced a bug
| | * | am bae1c102: remove an Icon change that introduced a bugJohn Hoford2013-09-131-1/+1
| | |\| | | | | | | | | | | | | | | | | * commit 'bae1c10284c23598aa169c7acea0487632ba0da4': remove an Icon change that introduced a bug
| | | * remove an Icon change that introduced a bugJohn Hoford2013-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cl 358665 introduced a bug in the UI for curves & sharpen This backs out the change to Editor.java bug:10705772 Change-Id: I46edc834c1db55d7ac38906dc60a42b3f2672509
* | | | am 75d70625: am 2187c9c5: am b55bfb6e: fix crashes in in gallery by ↵John Hoford2013-09-132-39/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | reversing previous cl * commit '75d70625d21590bf36dad183fbbdc0a8818a256a': fix crashes in in gallery by reversing previous cl
| * | | am 2187c9c5: am b55bfb6e: fix crashes in in gallery by reversing previous clJohn Hoford2013-09-132-39/+0
| |\| | | | | | | | | | | | | | | | | | * commit '2187c9c5e41984378d2b333f65bc62e6922fbc6e': fix crashes in in gallery by reversing previous cl
| | * | am b55bfb6e: fix crashes in in gallery by reversing previous clJohn Hoford2013-09-132-39/+0
| | |\| | | | | | | | | | | | | | | | | * commit 'b55bfb6e6000881c56d4de39c9cf71929ed87a18': fix crashes in in gallery by reversing previous cl
| | | * fix crashes in in gallery by reversing previous clJohn Hoford2013-09-132-39/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cl 348551 tried to fix a long existing bug which but introduced race conditions in the system bug:10652636 bug:10551751 bug:8794694 Change-Id: Ieb617f85df32a5d82293e555621a7e44b8b84708
* | | | am e762cca7: am 18277855: am bc7e9fff: Merge "Draw UI fixes" into ↵John Hoford2013-09-1228-223/+568
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'e762cca761b2ba649fe47b41d71ce0062b946b22': Draw UI fixes
| * | | am 18277855: am bc7e9fff: Merge "Draw UI fixes" into gb-ub-photos-carlsbadJohn Hoford2013-09-1228-223/+568
| |\| | | | | | | | | | | | | | | | | | * commit '18277855f7d3b236aad25f752f2d0dce9887fc1f': Draw UI fixes
| | * | am bc7e9fff: Merge "Draw UI fixes" into gb-ub-photos-carlsbadJohn Hoford2013-09-1228-223/+568
| | |\| | | | | | | | | | | | | | | | | * commit 'bc7e9fff7e94bb96fb7fe46080dcde2b81e60817': Draw UI fixes
| | | * Merge "Draw UI fixes" into gb-ub-photos-carlsbadJohn Hoford2013-09-1328-223/+568
| | | |\
| | | | * Draw UI fixesJohn Hoford2013-09-1228-223/+568
| | | | | | | | | | | | | | | | | | | | | | | | | bug:10705772 Change-Id: I529d178cdd4fc910b50a3f8c72187b1c61924743
* | | | | am ea08f4a8: am b6f868b5: Merge "Update Gallery due to API change." into klp-devSvetoslav2013-09-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea08f4a8d932502174cd60d87da3c79d86e9a8de': Update Gallery due to API change.
| * | | | am b6f868b5: Merge "Update Gallery due to API change." into klp-devSvetoslav2013-09-121-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b6f868b5517269980aea965ac97d0943cbb023f0': Update Gallery due to API change.
| | * | | Merge "Update Gallery due to API change." into klp-devSvetoslav2013-09-131-1/+1
| | |\ \ \
| | | * | | Update Gallery due to API change.Svetoslav2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iebb5c774a05581ba3c3b29d695ee7d5fa37576b8
* | | | | | am 0b7454cf: am 5db6307d: am 7fa373b0: Fix pipeline overstressnicolasroard2013-09-123-3/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b7454cf77ea93ecc394d4ee4bdbc1a4fe13146d': Fix pipeline overstress
| * | | | | am 5db6307d: am 7fa373b0: Fix pipeline overstressnicolasroard2013-09-123-3/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5db6307de500d7774626713e76b559afd94b1096': Fix pipeline overstress
| | * | | | am 7fa373b0: Fix pipeline overstressnicolasroard2013-09-123-3/+18
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | * commit '7fa373b0c3143c2c55a0d72487607d5a05c72e1d': Fix pipeline overstress
| | | * | Fix pipeline overstressnicolasroard2013-09-123-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderRequest for filters-only were called too frequently Change-Id: I04b6a1337d23dcb012544a66b9352f209d98ee72
* | | | | am 7343f946: am 004fcfc7: am 8e2a41b7: Merge "Fix triangle indicator" into ↵nicolasroard2013-09-124-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '7343f946319fbd79a87872657445c12ed2bd5abc': Fix triangle indicator
| * | | | am 004fcfc7: am 8e2a41b7: Merge "Fix triangle indicator" into ↵nicolasroard2013-09-124-4/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '004fcfc7d13c1c35a059b39f16e9121883fd6739': Fix triangle indicator
| | * | | am 8e2a41b7: Merge "Fix triangle indicator" into gb-ub-photos-carlsbadnicolasroard2013-09-124-4/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '8e2a41b7e68338fea06d2a64864348e70d8afe7d': Fix triangle indicator
| | | * | Merge "Fix triangle indicator" into gb-ub-photos-carlsbadnicolasroard2013-09-124-4/+3
| | | |\ \
| | | | * | Fix triangle indicatornicolasroard2013-09-124-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10705772 Change-Id: Ib79f9894c57c77c12f8364fc689638a0aad582e6
* | | | | | am b18de47f: am 39a155c7: am fcf74f8d: Merge "Enable virtualization" into ↵Mangesh Ghiware2013-09-121-0/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'b18de47f9ddd5964bc2975638e4dafc07f283e3e': Enable virtualization
| * | | | | am 39a155c7: am fcf74f8d: Merge "Enable virtualization" into ↵Mangesh Ghiware2013-09-121-0/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '39a155c78821c4049a55f06810912a2ac5bc62e2': Enable virtualization
| | * | | | am fcf74f8d: Merge "Enable virtualization" into gb-ub-photos-carlsbadMangesh Ghiware2013-09-121-0/+21
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fcf74f8dddddd350466e406f9f1cb2181077ffda': Enable virtualization
| | | * | | Merge "Enable virtualization" into gb-ub-photos-carlsbadMangesh Ghiware2013-09-121-0/+21
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Enable virtualizationMarco Nelissen2013-09-121-0/+21
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Intent says to virtualize, and the right virtualizer is present on the device, enable virtualization. Bug: 8767565 Bug: 10727216 Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2 (cherry picked from commit af6b0d2c08afd7803a92856c7c39b5e6144addfa)
* | | | | am 1844b200: am 75974071: am eb6a9b9c: Merge "fix Edit from filmstrip bug" ↵John Hoford2013-09-121-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '1844b200986e4e69455d25d9304b44ed04073379': fix Edit from filmstrip bug
| * | | | am 75974071: am eb6a9b9c: Merge "fix Edit from filmstrip bug" into ↵John Hoford2013-09-121-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '759740717fc8ae3515a50196e40417b27ca59089': fix Edit from filmstrip bug
| | * | | am eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbadJohn Hoford2013-09-121-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'eb6a9b9cdd2ec4bd9139c32ace454c329f1f3147': fix Edit from filmstrip bug
| | | * | Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbadJohn Hoford2013-09-121-0/+4
| | | |\ \ | | | | |/ | | | |/|
| | | | * fix Edit from filmstrip bugJohn Hoford2013-09-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | bug:10707676 Change-Id: Idb27d36713782237a66ee2e06cafb603dc107fb4
* | | | | am bef57819: am cdc5ceac: am e10fd688: Fix constrained zoomnicolasroard2013-09-121-13/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'bef578192b63f954b4f1044e59dc6d050e861017': Fix constrained zoom
| * | | | am cdc5ceac: am e10fd688: Fix constrained zoomnicolasroard2013-09-121-13/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'cdc5ceac62eca08eed47f55b1aeb7bd01ca13cff': Fix constrained zoom
| | * | | am e10fd688: Fix constrained zoomnicolasroard2013-09-121-13/+28
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'e10fd68874fa3cff0e5c3ca07f1e5b9d40be1299': Fix constrained zoom
| | | * | Fix constrained zoomnicolasroard2013-09-121-13/+28
| | | |/ | | | | | | | | | | | | Change-Id: I3613ba23154897e9b7c1677ec9911453b5f73c0f
* | | | am 3c2cdb00: am cf360646: am 34e84323: Fix full-res geometrynicolasroard2013-09-124-101/+161
|\| | | | | | | | | | | | | | | | | | | * commit '3c2cdb00c22fb236d09a924311cc5e19cb0f39f1': Fix full-res geometry
| * | | am cf360646: am 34e84323: Fix full-res geometrynicolasroard2013-09-124-101/+161
| |\| | | | | | | | | | | | | | | | | | * commit 'cf360646a5373adff965d4426feb4c2cbdfb09d0': Fix full-res geometry
| | * | am 34e84323: Fix full-res geometrynicolasroard2013-09-124-101/+161
| | |\| | | | | | | | | | | | | | | | | * commit '34e8432353acb0c45253cf4ef855512c7472019b': Fix full-res geometry
| | | * Fix full-res geometrynicolasroard2013-09-124-101/+161
| | | | | | | | | | | | | | | | Change-Id: I25f2fde1031ba7d896c82484a3da0ea03bcff7b8
* | | | am e9800eb6: am 09b825b1: am 5d727d85: Merge "Fix straighten tool" into ↵nicolasroard2013-09-121-3/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'e9800eb6e6979647e7f0d8af849542c7da099efd': Fix straighten tool