summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | Fix overdraw the correct way...nicolasroard2012-11-282-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7634701 Change-Id: Ifa7061dac35e948120c1a481c40bcf107f7ee6e1
| * | | | | | | | am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-archesnicolasroard2012-11-282-2/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa': Fix flashing in geometry panel
| | * | | | | | | Merge "Fix flashing in geometry panel" into gb-ub-photos-archesnicolasroard2012-11-282-2/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix flashing in geometry panelnicolasroard2012-11-282-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7406402 Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
| * | | | | | | | | am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into ↵nicolasroard2012-11-282-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '68e4ae64380e2c9843faaec63b98ba51479c0f11': Fix overdraw in FilterShow activity
| | * | | | | | | | Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-archesnicolasroard2012-11-282-1/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix overdraw in FilterShow activitynicolasroard2012-11-282-1/+5
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7634701 Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2
| * | | | | | | | | am 3507b925: Merge "Add new borders assets" into gb-ub-photos-archesnicolasroard2012-11-284-1/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5': Add new borders assets
| | * | | | | | | | Merge "Add new borders assets" into gb-ub-photos-archesnicolasroard2012-11-284-1/+11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Add new borders assetsnicolasroard2012-11-284-1/+11
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7386268 Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
| * | | | | | | | | am cd84d676: Fix history panel overlapnicolasroard2012-11-281-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd84d67629075795d4c5c28d980f77ff8d75c593': Fix history panel overlap
| | * | | | | | | | Fix history panel overlapnicolasroard2012-11-281-0/+4
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7545507 Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
| * | | | | | | | am 987bc8aa: Fix wrong colors in Curvesnicolasroard2012-11-281-1/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '987bc8aaafa55c45451937b27d94c1d602de4d68': Fix wrong colors in Curves
| | * | | | | | | Fix wrong colors in Curvesnicolasroard2012-11-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7633765 Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
| * | | | | | | | am d24fdf6a: Merge "Fix moving points in the Curves editor" into ↵nicolasroard2012-11-281-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da': Fix moving points in the Curves editor
| | * | | | | | | Merge "Fix moving points in the Curves editor" into gb-ub-photos-archesnicolasroard2012-11-281-1/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix moving points in the Curves editornicolasroard2012-11-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7632994 Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
| * | | | | | | | | am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-archesRuben Brunk2012-11-281-0/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a36d4275ea0375d4e6a940cc3307dbe716cf85c': Added locking to ImageLoader.
| | * | | | | | | | Merge "Added locking to ImageLoader." into gb-ub-photos-archesRuben Brunk2012-11-281-0/+13
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Added locking to ImageLoader.Ruben Brunk2012-11-281-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7471850 Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
| * | | | | | | | | | am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into ↵John Hoford2012-11-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'e5b979edb369877463e07680dddd9983bd2501cb': reduce size of tiny planet if malloc fails
| | * | | | | | | | | Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-archesJohn Hoford2012-11-281-3/+22
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | reduce size of tiny planet if malloc failsJohn Hoford2012-11-081-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7477815 Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
| * | | | | | | | | | am 5d2227a7: Merge "Add a triangle to the popup button view" into ↵nicolasroard2012-11-282-5/+34
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '5d2227a793b51f44f664a739cc7e931c40ba4970': Add a triangle to the popup button view
| | * | | | | | | | | Merge "Add a triangle to the popup button view" into gb-ub-photos-archesnicolasroard2012-11-282-5/+34
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Add a triangle to the popup button viewnicolasroard2012-10-302-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7442434 Change-Id: I7b784f2a5662ef694daef6cd926f60694b3eee4f
| * | | | | | | | | | am 6a94446d: Minor fix for some FP rounding errors in crop.Ruben Brunk2012-11-283-5/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a94446de01e8b6b034cc537ee3e65d507d47a47': Minor fix for some FP rounding errors in crop.
| | * | | | | | | | | Minor fix for some FP rounding errors in crop.Ruben Brunk2012-11-273-5/+10
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 7566505 Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa
| * | | | | | | | | am 3c6a0610: Remove orientation compensationYour Name2012-11-272-89/+20
| |\| | | | | | | | | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c6a0610d50a866e520485163011c79d9ee62457': Remove orientation compensation
| | * | | | | | | Remove orientation compensationYour Name2012-11-272-89/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7446056 Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
| * | | | | | | | am c0c7418a: Import translations. DO NOT MERGEBaligh Uddin2012-11-160-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0c7418a7275131786a296c006864fcca3b559e9': Import translations. DO NOT MERGE
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29a06b074154db39f5ad21cb3ddcbfb556e4fd60 Auto-generated-cl: translation import
| * | | | | | | | | am c6e93291: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-11-160-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6e93291c33c3aeb6d9a71bf5ce3033eb980a0f4': Import translations. DO NOT MERGE
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie207a187da4dcd2212b987ec47e1faf24542ae08 Auto-generated-cl: translation import
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-162-2/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76cccdd7c79efdc991b2f5e560190588d676e36e Auto-generated-cl: translation import
| * | | | | | | | am 18b38883: Guard tiles by synchronized block.Angus Kong2012-11-151-40/+52
| |\| | | | | | | | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '18b388839ed9858a3b35cec9a636e5cde58a528a': Guard tiles by synchronized block.
| | * | | | | | Guard tiles by synchronized block.Angus Kong2012-11-141-40/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tiles might be touched in different threads. bug:7490351 Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a
| * | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-120-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2e420d2351705c4bcb89c0787951f431ebdd56d
| * \ \ \ \ \ \ \ am 8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-11-092-12/+12
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '8182ed32d7dac4209086b6f33843167291a5aa77': Import translations. DO NOT MERGE
| * | | | | | | | am 46281de7: Import translations. DO NOT MERGEBaligh Uddin2012-11-090-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46281de7f9d1fd32f20598efd31e7a8f2e7c2ac3': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-11-090-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '139efdbcd66d718b0d24d42e2ea18432469ac005': Import translations. DO NOT MERGE
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-11-092-12/+12
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-092-12/+12
| | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77990cac84f1cd8e4762bd4d5df314dc52117081 Auto-generated-cl: translation import
| * | | | | | | | | am b0aae659: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-11-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0aae659bdc27af5dbe460541f3e9843fc815b1f': Import translations. DO NOT MERGE
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-093-5/+5
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8 Auto-generated-cl: translation import
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-093-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8 Auto-generated-cl: translation import
| * | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-080-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8f361c784adbf1b22de8a82b4cbdc2ea3a15bf7
| * \ \ \ \ \ \ \ \ am 8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGEJohn Hoford2012-11-081-3/+22
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8253c35a5d9564afbc667f7a9f42fdc0a734bcf8': reduce size of tiny planet if malloc fails - DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8db9fb7159802c84866bdc4edd136c9a75880397
| * \ \ \ \ \ \ \ \ \ \ am 2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-11-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a8405d7e5439e1098598f47081530c550733f12': Import translations. DO NOT MERGE
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 13:14:15 +0000