OSDN Git Service
nicolasroard [Wed, 13 Feb 2013 00:32:43 +0000 (16:32 -0800)]
Clean up red eye correction
Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
John Hoford [Wed, 13 Feb 2013 00:59:13 +0000 (16:59 -0800)]
fix ranges for various filters
Change-Id: I6790b06c5c4094c442ce19cb2ed7ddb6a4152f3a
Angus Kong [Wed, 13 Feb 2013 00:58:18 +0000 (00:58 +0000)]
Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 00:09:31 +0000 (00:09 +0000)]
Merge "Turn back on the state panel" into gb-ub-photos-bryce
John Hoford [Wed, 13 Feb 2013 00:07:43 +0000 (00:07 +0000)]
Merge "fix the draw clear bug" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 00:06:15 +0000 (16:06 -0800)]
Turn back on the state panel
Change-Id: I22706078d4026ce4e24917c484a30a56de431983
Tenghui Zhu [Tue, 12 Feb 2013 22:59:54 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into gb-ub-photos-bryce
Marco Nelissen [Wed, 6 Feb 2013 23:35:52 +0000 (15:35 -0800)]
DO NOT MERGE: Don't call requestLayout from onLayout
Doing a layout within a layout can lead to various problems, so it should
be avoided. There's some logging that warns of this, which got triggered
by CommonControllerOverlay.
I don't know what problem this code was originally trying to solve, but it
doesn't seem to be necessary anymore. The line in question was originally
introduced in change
209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011.
Note: This has been checked into master, this is just cherry picking into
Bryce branch.
Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
John Hoford [Tue, 12 Feb 2013 21:42:19 +0000 (13:42 -0800)]
fix the draw clear bug
Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
nicolasroard [Tue, 12 Feb 2013 21:41:30 +0000 (13:41 -0800)]
Add null check on the source URI
bug:
8181133
Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
nicolasroard [Tue, 12 Feb 2013 21:37:18 +0000 (21:37 +0000)]
Merge "Limit preview size" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 21:31:15 +0000 (13:31 -0800)]
Limit preview size
Change-Id: I4b9b43abcb509407f9244a776d31cc96876a26cd
Baligh Uddin [Tue, 12 Feb 2013 21:33:55 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 12 Feb 2013 21:33:08 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 12 Feb 2013 20:42:24 +0000 (12:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4494f5cb2e1ed520a15a3a8052713559ee48e362
Auto-generated-cl: translation import
Baligh Uddin [Tue, 12 Feb 2013 20:41:38 +0000 (12:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie08f4a95d5662bfb313a851c12a2643997365eeb
Auto-generated-cl: translation import
nicolasroard [Tue, 12 Feb 2013 20:19:19 +0000 (12:19 -0800)]
Refactor FiltersManager
Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
John Hoford [Tue, 12 Feb 2013 19:55:50 +0000 (11:55 -0800)]
refactor quality to be int
Change-Id: I0470abdbe75cf48c5228e80b9dc060ae6f3d8bbd
nicolasroard [Tue, 12 Feb 2013 18:47:34 +0000 (10:47 -0800)]
Add reset bitmap for RS filters
Change-Id: I34e28ca72d13f9b5f8054d8a2c07cfffca4e85c6
nicolasroard [Tue, 12 Feb 2013 18:26:29 +0000 (10:26 -0800)]
Update thumbnails when the geometry changes
Change-Id: I44d70839efb7e00edfb1e6c1f73296beab09783c
Angus Kong [Tue, 12 Feb 2013 00:28:04 +0000 (16:28 -0800)]
Wait for the previous MosaicPreviewRenderer to end
When changing orientations very fast, there might be 2 MosaicPreviewRenderer
instances accessing the SRI native library at the same time. The library is not
designed so.
bug:
8151753
Change-Id: Ie7a381349feeb95b40bae3c093cfcb66acba9069
nicolasroard [Tue, 12 Feb 2013 17:27:44 +0000 (17:27 +0000)]
Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 17:13:15 +0000 (09:13 -0800)]
Generate thumbnails asynchronously
Change-Id: I6a2520fc869280a2a7be9c9b5673e17038964a02
John Hoford [Tue, 12 Feb 2013 17:05:39 +0000 (09:05 -0800)]
remove animations if before Jelly Bean
Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2
John Hoford [Tue, 12 Feb 2013 04:55:45 +0000 (20:55 -0800)]
fixes the draw and clean up the UI
Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec
nicolasroard [Tue, 12 Feb 2013 02:24:34 +0000 (02:24 +0000)]
Merge "Adding support for ICS" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 02:15:15 +0000 (18:15 -0800)]
Adding support for ICS
Change-Id: I550d461b08a4cc5ceb3cdefd82301d5986325184
John Hoford [Tue, 12 Feb 2013 01:47:42 +0000 (01:47 +0000)]
Merge "fix red eye to use the new system" into gb-ub-photos-bryce
Stephen Hines [Tue, 12 Feb 2013 01:25:31 +0000 (01:25 +0000)]
Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce
John Hoford [Sat, 9 Feb 2013 01:30:53 +0000 (17:30 -0800)]
fix red eye to use the new system
Change-Id: If79106dc3144cce374afd410f5f859692e564b83
Tim Murray [Mon, 11 Feb 2013 23:49:57 +0000 (23:49 +0000)]
Merge "Only create one RS context." into gb-ub-photos-bryce
nicolasroard [Mon, 11 Feb 2013 23:44:04 +0000 (15:44 -0800)]
Move useFilterRepresentation to PanelController
Change-Id: I8abd9b2bd1b808df6a84e334b6eaa36b1c16750d
Tim Murray [Mon, 11 Feb 2013 23:29:20 +0000 (15:29 -0800)]
Only create one RS context.
Change-Id: I527da839142cd2e48fb81e8cb02b43f6f87147d6
nicolasroard [Mon, 11 Feb 2013 22:30:48 +0000 (22:30 +0000)]
Merge "Cleaning filters" into gb-ub-photos-bryce
nicolasroard [Mon, 11 Feb 2013 17:55:33 +0000 (09:55 -0800)]
Cleaning filters
Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
Doris Liu [Mon, 11 Feb 2013 21:39:41 +0000 (21:39 +0000)]
Merge "Lock focus during countdown" into gb-ub-photos-bryce
Doris Liu [Mon, 11 Feb 2013 21:33:29 +0000 (21:33 +0000)]
Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
Stephen Hines [Fri, 8 Feb 2013 02:41:27 +0000 (18:41 -0800)]
Switch to GalleryGoogle as default provider for RS files (from Gallery2).
Bug:
8138884
Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0
nicolasroard [Sat, 9 Feb 2013 02:13:24 +0000 (18:13 -0800)]
Move filter type to representations
Change-Id: I2d49447c57f4ff49001d27cdfa6482ca320c7a8b
nicolasroard [Sat, 9 Feb 2013 01:48:54 +0000 (17:48 -0800)]
Fix crash when reset
Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea
nicolasroard [Sat, 9 Feb 2013 01:03:37 +0000 (01:03 +0000)]
Merge "Fix loading screen" into gb-ub-photos-bryce
Doris Liu [Sat, 9 Feb 2013 01:00:46 +0000 (17:00 -0800)]
Fix camera setting icons appearing in wrong place
Bug:
7956904
Change-Id: I1b2d3fef8d82a3efeb0caa5130ce3dbb6808af70
nicolasroard [Sat, 9 Feb 2013 01:00:42 +0000 (17:00 -0800)]
Fix loading screen
Change-Id: Id41c4c93782bea7f11d75f0ddcdd4529f4fc9758
John Hoford [Fri, 8 Feb 2013 01:39:06 +0000 (17:39 -0800)]
Fix tiny planet to work with the new framework
Change-Id: I57e87ade6f2cfdfee1b237cdfdf5914244ee98aa
John Hoford [Fri, 8 Feb 2013 22:37:35 +0000 (14:37 -0800)]
remove slider from FX and Border UI
Change-Id: Ic1c38734c4351ab0150b90d5d4fc575cce9db9e9
nicolasroard [Fri, 8 Feb 2013 22:52:55 +0000 (22:52 +0000)]
Merge "Fix leaks / init" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 22:06:33 +0000 (14:06 -0800)]
Fix leaks / init
Change-Id: I5befdc24cc89cdcfb73ee4d13f076b1c4a585cf6
Bobby Georgescu [Fri, 8 Feb 2013 21:53:17 +0000 (13:53 -0800)]
Change transition from Gallery to Filtershow
Bug:
8163894
Change-Id: Iaed600df39a88b176cb8ed3316d187c26c6b7961
Bobby Georgescu [Fri, 8 Feb 2013 20:50:03 +0000 (20:50 +0000)]
Merge "Replace background getDrawable calls to avoid ANR" into gb-ub-photos-bryce
Baligh Uddin [Fri, 8 Feb 2013 19:31:11 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 8 Feb 2013 19:27:10 +0000 (11:27 -0800)]
Replace background getDrawable calls to avoid ANR
Bug:
8148243
Change-Id: I0b94c647bd39b2aabd9cd5316a82b3ef3573b710
Baligh Uddin [Fri, 8 Feb 2013 19:20:47 +0000 (11:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib2608f12c4288a67289791c7bf41d51420550b8b
Auto-generated-cl: translation import
nicolasroard [Fri, 8 Feb 2013 18:36:00 +0000 (10:36 -0800)]
Cleanup
Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42
nicolasroard [Fri, 8 Feb 2013 03:19:58 +0000 (03:19 +0000)]
Merge "Fix borders" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 02:58:33 +0000 (18:58 -0800)]
Fix borders
Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e
Baligh Uddin [Fri, 8 Feb 2013 01:31:13 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 01:25:04 +0000 (17:25 -0800)]
Add todo
Change-Id: I54fd72da364337833f80a0f1913beadf2af74277
nicolasroard [Fri, 8 Feb 2013 01:23:36 +0000 (01:23 +0000)]
Merge "Fix Fx filters" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 00:59:29 +0000 (16:59 -0800)]
Fix Fx filters
Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea
John Hoford [Thu, 7 Feb 2013 22:45:00 +0000 (22:45 +0000)]
Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce
Jason Noguchi [Thu, 7 Feb 2013 22:44:54 +0000 (22:44 +0000)]
Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce
John Hoford [Tue, 5 Feb 2013 17:09:04 +0000 (09:09 -0800)]
fix draw and curves to use FilterRepresentation
Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349
Doris Liu [Thu, 7 Feb 2013 22:36:32 +0000 (14:36 -0800)]
Lock focus during countdown
Change-Id: Ia8d4250daa488c35e276218e9fdb8efdf00836c2
Doris Liu [Thu, 7 Feb 2013 21:51:20 +0000 (21:51 +0000)]
Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce
Doris Liu [Thu, 7 Feb 2013 20:32:42 +0000 (12:32 -0800)]
Fix memory leak in ComboPreferences
Bug:
8028546
Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185
Jason Noguchi [Thu, 7 Feb 2013 02:49:51 +0000 (18:49 -0800)]
Remove reference to local libraries. Make CameraTest build against the SDK instead.
Change-Id: I5885de7f569f4c0e1e5156d8a1634fc13c1b558d
nicolasroard [Thu, 7 Feb 2013 20:01:59 +0000 (12:01 -0800)]
Fix flashing on geometry preview
Change-Id: I0f05d654c1c4373016d2d5766eb983a47fab2780
nicolasroard [Thu, 7 Feb 2013 19:47:37 +0000 (19:47 +0000)]
Merge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce
nicolasroard [Thu, 7 Feb 2013 02:40:09 +0000 (18:40 -0800)]
Fix filters only + geometry only rendering
Change-Id: Id8f0637ae53864488cb931def196ee50ae807f5c
John Reck [Thu, 7 Feb 2013 01:12:36 +0000 (01:12 +0000)]
Merge "Request GALLERY_PROVIDER permission" into gb-ub-photos-bryce
Baligh Uddin [Wed, 6 Feb 2013 22:49:30 +0000 (14:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idbf032a0393d123b931721ba9c6fb6a61e25ec74
Auto-generated-cl: translation import
John Reck [Wed, 6 Feb 2013 21:18:47 +0000 (13:18 -0800)]
Request GALLERY_PROVIDER permission
Bug:
8138594
Change-Id: I39f446f8066cf15a62acf3f16c0faa84bc4b71d7
nicolasroard [Wed, 6 Feb 2013 01:09:05 +0000 (17:09 -0800)]
Refactor to use direct manipulations of FilterRepresentations.
Change-Id: If5f92f137283cb126835be004d315942ff95021c
nicolasroard [Tue, 5 Feb 2013 21:43:45 +0000 (13:43 -0800)]
fix editor visibility
Change-Id: I0c9c5273b49974884b8bdf365211b33de54c5598
nicolasroard [Tue, 5 Feb 2013 21:42:40 +0000 (21:42 +0000)]
Merge "Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle" into gb-ub-photos-bryce
John Reck [Tue, 5 Feb 2013 21:18:14 +0000 (21:18 +0000)]
Merge "Cleanup" into gb-ub-photos-bryce
John Reck [Tue, 5 Feb 2013 18:44:51 +0000 (10:44 -0800)]
Cleanup
Move Canvas to com.android.photos.canvas
Remove workaround for b/
8079561
Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
Baligh Uddin [Tue, 5 Feb 2013 20:13:48 +0000 (20:13 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 5 Feb 2013 20:13:14 +0000 (20:13 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 00:36:46 +0000 (16:36 -0800)]
Refactor filters parameters
- introduce FilterRepresentations
- change filters lifecycle
Change-Id: I9416fca47a334d532a347cd5577795738c870933
Stephen Hines [Tue, 5 Feb 2013 02:49:48 +0000 (02:49 +0000)]
Merge "Remove RS intermediates to trigger a clean build." into gb-ub-photos-bryce
Stephen Hines [Tue, 5 Feb 2013 02:19:04 +0000 (18:19 -0800)]
Remove RS intermediates to trigger a clean build.
Change-Id: I4925dbf21b81876bac85413f8057049e84ca324c
John Reck [Tue, 5 Feb 2013 02:00:38 +0000 (02:00 +0000)]
Merge "Handle syncing better" into gb-ub-photos-bryce
John Reck [Tue, 5 Feb 2013 01:18:32 +0000 (17:18 -0800)]
Handle syncing better
Bug:
8104531
Limit to every 15 minutes
Avoid requesting a sync on a MediaSet that's already syncing
Change-Id: Iac4522cd305c64696317cc7088b0e851a2b81893
Tim Murray [Mon, 4 Feb 2013 21:09:27 +0000 (13:09 -0800)]
Switch Gallery over to RS compatibility library.
Change-Id: If27809236534f3b196949bf455faed45c99f3da5
Baligh Uddin [Mon, 4 Feb 2013 18:14:06 +0000 (10:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I25498bf6ba9f7c4987fb5c49efff040eb5068b31
Auto-generated-cl: translation import
Baligh Uddin [Mon, 4 Feb 2013 18:12:59 +0000 (10:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie03d9483555fe0f4ac4d444be4cf1eef647c6e63
Auto-generated-cl: translation import
John Hoford [Sat, 2 Feb 2013 00:22:50 +0000 (16:22 -0800)]
fix performance problem with large images in draw
Change-Id: I9fa5a90e58273c6dd6e80d7d0bf07c3371a6f10e
John Hoford [Fri, 1 Feb 2013 21:56:26 +0000 (21:56 +0000)]
Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce
nicolasroard [Fri, 1 Feb 2013 21:51:43 +0000 (21:51 +0000)]
Merge "Fix async loading of borders" into gb-ub-photos-bryce
John Hoford [Fri, 1 Feb 2013 21:41:16 +0000 (13:41 -0800)]
fix sharpen to work under the new system
Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19
nicolasroard [Fri, 1 Feb 2013 21:48:21 +0000 (13:48 -0800)]
Fix async loading of borders
bug:
8099597
Change-Id: I62584c87eff03539ec50aafafda4238850b4f743
Doris Liu [Fri, 1 Feb 2013 21:22:25 +0000 (21:22 +0000)]
Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce
Doris Liu [Fri, 1 Feb 2013 03:03:48 +0000 (19:03 -0800)]
Move tests from camera to gallery2
Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9
Baligh Uddin [Fri, 1 Feb 2013 18:31:59 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 1 Feb 2013 18:31:02 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Angus Kong [Fri, 1 Feb 2013 18:19:57 +0000 (18:19 +0000)]
Merge "Make video snapshot save images in the background." into gb-ub-photos-bryce
John Hoford [Fri, 1 Feb 2013 17:56:19 +0000 (09:56 -0800)]
Fix curves refresh bug
Change-Id: I5c85dcfa118345d24a5fef120541741e7d1cbdd6
Baligh Uddin [Fri, 1 Feb 2013 16:58:55 +0000 (08:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibc8434acc5356c40eddc6acd96a519efb806f6b9
Auto-generated-cl: translation import
Baligh Uddin [Fri, 1 Feb 2013 16:57:48 +0000 (08:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9b7a8af6d2e6e0fe2f08119081881905a7e81c33
Auto-generated-cl: translation import