summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbadrepo sync2013-04-225-29/+44
|\
| * Merge "fixed borders issues" into gb-ub-photos-bryceJohn Hoford2013-04-195-65/+44
| |\
| | * fixed borders issuesJohn Hoford2013-04-185-65/+44
* | | Merge "Update the duration information when saving new video" into gb-ub-phot...ztenghui2013-04-191-1/+18
|\ \ \
| * | | Update the duration information when saving new videoztenghui2013-04-181-1/+18
* | | | am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryceFlavio Lerda2013-04-181-4/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Remove unused imports." into gb-ub-photos-bryceFlavio Lerda2013-04-181-4/+0
| |\ \ \
| | * | | Remove unused imports.Flavio Lerda2013-04-181-4/+0
* | | | | am 5b083f89: Add more menu options/iconsMichael Kolb2013-04-182-42/+80
|\| | | |
| * | | | Add more menu options/iconsMichael Kolb2013-04-182-42/+80
| |/ / /
* | | | am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." ...George Mount2013-04-181-1/+1
|\| | |
| * | | Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-pho...George Mount2013-04-181-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Change labels so that it doesn't clash with PanoUiLib.George Mount2013-04-181-1/+1
* | | | am c3178ca4: Gallery crop uses new activity. Fixed image quality.Ruben Brunk2013-04-186-251/+648
|\| | |
| * | | Gallery crop uses new activity. Fixed image quality.Ruben Brunk2013-04-186-251/+648
* | | | Add extra perf loggingnicolasroard2013-04-181-0/+10
* | | | am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryceFlavio Lerda2013-04-182-3/+35
|\| | |
| * | | Merge "Usage statistics for sharing." into gb-ub-photos-bryceFlavio Lerda2013-04-182-3/+35
| |\ \ \
| | * | | Usage statistics for sharing.Flavio Lerda2013-04-172-3/+35
* | | | | Merge "Support for save state in images" into gb-ub-photos-carlsbadJohn Hoford2013-04-1832-31/+585
|\ \ \ \ \
| * | | | | Support for save state in imagesJohn Hoford2013-04-1732-31/+585
* | | | | | am 61f3f111: Remove call to superclass onTouch in curves.Ruben Brunk2013-04-171-2/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Remove call to superclass onTouch in curves.Ruben Brunk2013-04-171-2/+0
* | | | | | Revert "Remove redeye filter."Ruben Brunk2013-04-171-2/+2
* | | | | | am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryceRuben Brunk2013-04-171-2/+2
|\| | | | |
| * | | | | Merge "Remove redeye filter." into gb-ub-photos-bryceRuben Brunk2013-04-181-2/+2
| |\ \ \ \ \
| | * | | | | Remove redeye filter.Ruben Brunk2013-04-171-2/+2
* | | | | | | am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-u...Sascha Haeberling2013-04-171-3/+6
|\| | | | | |
| * | | | | | Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryceSascha Haeberling2013-04-181-3/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add method for returning SoundPool audio type.Sascha Haeberling2013-04-171-3/+6
* | | | | | | am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryceJohn Hoford2013-04-171-8/+48
|\| | | | | |
| * | | | | | Merge "improve pinch to zoom behavior" into gb-ub-photos-bryceJohn Hoford2013-04-181-8/+48
| |\ \ \ \ \ \
| | * | | | | | improve pinch to zoom behaviorJohn Hoford2013-04-171-8/+48
| | |/ / / / /
* | | | | | | am 1c7d2bc2: First part of asset dropMichael Kolb2013-04-172-9/+22
|\| | | | | |
| * | | | | | First part of asset dropMichael Kolb2013-04-172-9/+22
| |/ / / / /
| * | / / / Add accessibility to video player controller.ztenghui2013-04-171-5/+18
| | |/ / / | |/| | |
* | | | | Merge "When video not seekable, don't show the scrubber" into gb-ub-photos-ca...ztenghui2013-04-173-1/+19
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | When video not seekable, don't show the scrubberztenghui2013-04-173-1/+19
* | | | | Fix border apply if no filter appliednicolasroard2013-04-172-6/+19
* | | | | Merge "Revert "Shows final set of filters in UI."" into gb-ub-photos-carlsbadRuben Brunk2013-04-171-4/+4
|\ \ \ \ \
| * | | | | Revert "Shows final set of filters in UI."Ruben Brunk2013-04-161-4/+4
| | |_|/ / | |/| | |
* | | | | am 83bd8d34: Remove History panelnicolasroard2013-04-163-111/+3
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Remove History panelnicolasroard2013-04-163-111/+3
* | | | am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryceRuben Brunk2013-04-161-4/+4
|\| | |
| * | | Merge "Shows final set of filters in UI." into gb-ub-photos-bryceRuben Brunk2013-04-161-4/+4
| |\ \ \
| | * | | Shows final set of filters in UI.Ruben Brunk2013-04-161-4/+4
* | | | | Re-enable Simple Editor menu itemnicolasroard2013-04-161-1/+1
* | | | | am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryceDoris Liu2013-04-161-2/+2
|\| | | |
| * | | | Merge "Fix face unlock failure" into gb-ub-photos-bryceDoris Liu2013-04-161-2/+2
| |\ \ \ \
| | * | | | Fix face unlock failureDoris Liu2013-04-161-2/+2