OSDN Git Service
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 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
Angus Kong [Fri, 1 Feb 2013 02:22:44 +0000 (18:22 -0800)]
Make video snapshot save images in the background.
bug:
8114662
Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
John Reck [Fri, 1 Feb 2013 01:32:42 +0000 (01:32 +0000)]
Merge "Animate between photo modules" into gb-ub-photos-bryce
John Reck [Wed, 7 Nov 2012 21:38:35 +0000 (13:38 -0800)]
Animate between photo modules
Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
Angus Kong [Thu, 31 Jan 2013 22:36:34 +0000 (22:36 +0000)]
Merge "Make background media saving a service" into gb-ub-photos-bryce
Angus Kong [Wed, 30 Jan 2013 01:43:48 +0000 (17:43 -0800)]
Make background media saving a service
bug:
8091328
Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48
John Hoford [Fri, 25 Jan 2013 21:28:34 +0000 (13:28 -0800)]
add color selection ui to draw
Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
John Reck [Thu, 31 Jan 2013 01:00:13 +0000 (01:00 +0000)]
Merge "show enable sync option for canvas" into gb-ub-photos-bryce
John Reck [Thu, 31 Jan 2013 00:37:48 +0000 (16:37 -0800)]
show enable sync option for canvas
Temporary change for testing
Change-Id: I46305cb3b182e0a48625bf4fcad3205334ade961
nicolasroard [Wed, 30 Jan 2013 23:54:29 +0000 (23:54 +0000)]
Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:57:42 +0000 (13:57 -0800)]
Clean up invalidate / redraw loop
Move the recopy to the main thread
Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce
Michael Kolb [Tue, 29 Jan 2013 23:24:34 +0000 (23:24 +0000)]
Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce
Michael Kolb [Tue, 29 Jan 2013 22:03:06 +0000 (14:03 -0800)]
Copy camera resources into Gallery2
Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
John Reck [Tue, 29 Jan 2013 21:55:57 +0000 (13:55 -0800)]
Extract constants/boilerplate
Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97
nicolasroard [Tue, 29 Jan 2013 21:41:51 +0000 (21:41 +0000)]
Merge "Fix thumbnail generation" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 21:38:34 +0000 (21:38 +0000)]
Merge "Importer: when view is reused for same image, don't reload" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:37:33 +0000 (13:37 -0800)]
Fix thumbnail generation
Change-Id: I03a290bf8eb80bd1687bfd37640dec29ef213cdb
Bobby Georgescu [Tue, 29 Jan 2013 21:30:12 +0000 (13:30 -0800)]
Importer: when view is reused for same image, don't reload
Bug:
7968780
Change-Id: I6786d140e516ff60562c5c0b1222fca0ea153216
nicolasroard [Tue, 29 Jan 2013 21:23:46 +0000 (21:23 +0000)]
Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:16:21 +0000 (13:16 -0800)]
Fix scaling + quality parameters
Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d
Michael Kolb [Tue, 29 Jan 2013 20:51:56 +0000 (20:51 +0000)]
Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 18:58:34 +0000 (10:58 -0800)]
Add comment about MenuExecutor assumptions in BatchService
Bug:
7998915
Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d
Michael Kolb [Tue, 29 Jan 2013 18:33:22 +0000 (10:33 -0800)]
Move Camera Java/Native source into Gallery2
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
John Reck [Tue, 29 Jan 2013 01:35:38 +0000 (01:35 +0000)]
Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
Ruben Brunk [Tue, 29 Jan 2013 00:54:58 +0000 (00:54 +0000)]
Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
Bobby Georgescu [Tue, 29 Jan 2013 00:51:51 +0000 (00:51 +0000)]
Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 00:46:12 +0000 (16:46 -0800)]
Fix apply geometry.
bug:
8068166
Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8
John Reck [Tue, 29 Jan 2013 00:38:47 +0000 (16:38 -0800)]
Launching gallery shows browse ui on canvas
Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622
Ruben Brunk [Tue, 29 Jan 2013 00:30:26 +0000 (16:30 -0800)]
Fixed BasicEditor NPE.
Bug:
8068020
Change-Id: I81df163d9779ae3e246f4e337b64dfbc32ce7db5
Bobby Georgescu [Tue, 29 Jan 2013 00:16:44 +0000 (16:16 -0800)]
Fix ANRs due to waiting for IO on UI thread
Bug:
7998915
Change-Id: I938145a7072170f713099a04578f98951b35cbab
John Reck [Mon, 28 Jan 2013 21:35:56 +0000 (13:35 -0800)]
Code drop
Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
Baligh Uddin [Mon, 28 Jan 2013 16:59:39 +0000 (08:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9d2f2471d62cbfdd11c9d3e6d9107fbc46fad3dd
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Jan 2013 22:36:04 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 23 Jan 2013 19:53:27 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id76648ccbbb45ea8d7ab7a759cd07bce5feb35ca
Auto-generated-cl: translation import
Stephen Hines [Wed, 23 Jan 2013 18:38:42 +0000 (18:38 +0000)]
Revert "Switch Gallery over to RS compatibility library."
This reverts commit
0746ce0977cde616d25ce35fee0d8d554235a21c
Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
Stephen Hines [Thu, 17 Jan 2013 01:54:08 +0000 (17:54 -0800)]
Switch Gallery over to RS compatibility library.
Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
Baligh Uddin [Wed, 23 Jan 2013 01:03:13 +0000 (01:03 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
nicolasroard [Wed, 16 Jan 2013 03:57:49 +0000 (19:57 -0800)]
Better caching for RS filters
Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d
Baligh Uddin [Tue, 22 Jan 2013 17:42:53 +0000 (09:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8a59ba2c18264af55063a5c3bf5ba6b7edec00cc
Auto-generated-cl: translation import
John Reck [Sat, 19 Jan 2013 00:45:14 +0000 (00:45 +0000)]
Merge "Tweaks for canvas" into gb-ub-photos-bryce
John Reck [Sat, 19 Jan 2013 00:00:45 +0000 (16:00 -0800)]
Tweaks for canvas
Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
John Hoford [Fri, 18 Jan 2013 23:56:51 +0000 (23:56 +0000)]
Merge "refactor the filter/editor relationship" into gb-ub-photos-bryce
John Hoford [Fri, 18 Jan 2013 16:59:35 +0000 (08:59 -0800)]
refactor the filter/editor relationship
Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
Bobby Georgescu [Fri, 18 Jan 2013 20:47:56 +0000 (12:47 -0800)]
Fix importer crashes on unplug during scrolling
Bug:
8035040
Change-Id: If822b15f2210e2af42c8a38f6ac2acb25d535aa9
Bobby Georgescu [Thu, 17 Jan 2013 22:07:31 +0000 (14:07 -0800)]
Fix importer crashes when unplugging during indexing
Bug:
8027984
Slightly refactored the indexing step to encapsulate all
of the indexing work within the runnable that does it and
to correctly handle the cases where the device is unplugged
in the middle of the indexing.
Change-Id: I338657bbbedd6b82d012f65cd1ea28e0afd890c2
Bobby Georgescu [Fri, 18 Jan 2013 01:12:40 +0000 (01:12 +0000)]
Merge "Show status in importer for empty or no device" into gb-ub-photos-bryce