OSDN Git Service
Ruben Brunk [Wed, 20 Feb 2013 22:44:02 +0000 (14:44 -0800)]
Removed unsupported GL operations.
Bug:
8223749
Change-Id: I722220def36aa4a9e53666540471100df6609d74
Victor Doba [Wed, 20 Feb 2013 17:29:53 +0000 (17:29 +0000)]
Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
John Hoford [Wed, 20 Feb 2013 16:31:40 +0000 (08:31 -0800)]
fix vignette startup issues
Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
John Hoford [Sat, 16 Feb 2013 17:20:59 +0000 (09:20 -0800)]
add movable vignette
Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
Michael Kolb [Sat, 16 Feb 2013 21:13:47 +0000 (13:13 -0800)]
Fix auto-focus areas
Use a specific focus area in continuous AF
Use a smaller AF area for tap to focus
Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
Michael Kolb [Mon, 18 Feb 2013 23:16:44 +0000 (15:16 -0800)]
Fix AF animation
Bug:
8219462
Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
Doris Liu [Sat, 16 Feb 2013 01:39:59 +0000 (01:39 +0000)]
Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
Doris Liu [Fri, 15 Feb 2013 18:55:37 +0000 (10:55 -0800)]
Make photo orientation consistent with UI
Also fixed the wrong animation orientation.
Bug:
7302506
Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
John Reck [Sat, 16 Feb 2013 00:08:26 +0000 (16:08 -0800)]
Remove more com.android.camera.R
Change-Id: I410baaf4a3f0d824d44ea24435a1716cad3bb966
John Reck [Sat, 16 Feb 2013 00:01:05 +0000 (00:01 +0000)]
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
John Reck [Fri, 15 Feb 2013 23:51:30 +0000 (15:51 -0800)]
Remove com.android.camera.R
Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
Bobby Georgescu [Fri, 15 Feb 2013 21:05:21 +0000 (21:05 +0000)]
Merge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce
Michael Kolb [Fri, 15 Feb 2013 15:43:12 +0000 (15:43 +0000)]
Merge "New capture animation" into gb-ub-photos-bryce
Victor Doba [Fri, 15 Feb 2013 12:24:41 +0000 (13:24 +0100)]
Show the Utility Panel by default.
Jason Noguchi [Fri, 15 Feb 2013 03:01:56 +0000 (03:01 +0000)]
Merge "Merging camera test with gallery test." into gb-ub-photos-bryce
Bobby Georgescu [Thu, 14 Feb 2013 03:23:54 +0000 (19:23 -0800)]
Don't use AsyncTasks to fetch images via MTP
Bug:
8192491
Avoids allocations when scrolling through the importer
grid by not using AsyncTasks anymore (which meant one
object creation per change of the source image). Also
fix an NPE if a device is unplugged during scrolling.
Change-Id: I4e7022ca5d4573402e60b16fbd82ea65bc6627e0
Ruben Brunk [Fri, 15 Feb 2013 01:29:31 +0000 (01:29 +0000)]
Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce
Ruben Brunk [Fri, 15 Feb 2013 00:18:22 +0000 (16:18 -0800)]
Fixed crop display for setting contacts/wallpapers.
Bug:
8187056
Bug:
8196779
Bug:
8140241
Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c
Jason Noguchi [Wed, 13 Feb 2013 23:35:23 +0000 (15:35 -0800)]
Merging camera test with gallery test.
Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
John Hoford [Thu, 14 Feb 2013 23:40:25 +0000 (23:40 +0000)]
Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce
John Hoford [Thu, 14 Feb 2013 23:08:28 +0000 (15:08 -0800)]
refactor to support many filter based on RedEye
Change-Id: I92ff19d8f750f5bf4c188129580e22990874501e
Michael Kolb [Thu, 14 Feb 2013 21:40:39 +0000 (13:40 -0800)]
New capture animation
Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4
Michael Kolb [Thu, 14 Feb 2013 21:43:00 +0000 (21:43 +0000)]
Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
Michael Kolb [Thu, 14 Feb 2013 16:30:59 +0000 (08:30 -0800)]
Fix inexplicable monkey NPE
Bug:
8049510
Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
Doris Liu [Thu, 14 Feb 2013 02:28:03 +0000 (18:28 -0800)]
Fix video disappearing when rotated
Bug:
7459723
Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37
Angus Kong [Thu, 14 Feb 2013 02:13:13 +0000 (18:13 -0800)]
Make ShutterButton visible after initialization.
bug:
8186870
Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
John Hoford [Wed, 13 Feb 2013 23:52:31 +0000 (15:52 -0800)]
get redeye working again
nicolasroard [Wed, 13 Feb 2013 23:51:25 +0000 (15:51 -0800)]
Fix sync representations
Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
John Hoford [Wed, 13 Feb 2013 19:40:52 +0000 (11:40 -0800)]
fix draw to support rotation/crop
Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
Bobby Georgescu [Wed, 13 Feb 2013 19:46:39 +0000 (19:46 +0000)]
Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 19:23:56 +0000 (11:23 -0800)]
Pass the ImagePreset to ImageFilter
Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
nicolasroard [Wed, 13 Feb 2013 03:40:08 +0000 (19:40 -0800)]
Fix curves slowness
Change-Id: If25f3ce1c3da02daa90405987075b87ce676c84e
Bobby Georgescu [Fri, 1 Feb 2013 20:57:14 +0000 (12:57 -0800)]
Importer: Full-screen viewing, UI refinement, refactoring
Bug:
7990333
Bug:
8151814
Bug:
8037411
This CL adds or changes the following things:
- Full-screen image viewing and UI for switching modes
- Moved general functionality from MtpThumbnailTileView
to MtpImageView to allow for reuse in full-screen image
use-case
- MtpBitmapCache moved from ui to data package
- Orientation now respected when set in image metadata
- Miscellaneous UI consistency issues fixed
- Miscellaneous instability issues fixed
Change-Id: I5f188b763617b693e32fedc03273d711d604922a
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:31:15 +0000 (13:31 -0800)]
Limit preview size
Change-Id: I4b9b43abcb509407f9244a776d31cc96876a26cd
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 [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
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 19:27:10 +0000 (11:27 -0800)]
Replace background getDrawable calls to avoid ANR
Bug:
8148243
Change-Id: I0b94c647bd39b2aabd9cd5316a82b3ef3573b710
nicolasroard [Fri, 8 Feb 2013 18:36:00 +0000 (10:36 -0800)]
Cleanup
Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42
nicolasroard [Fri, 8 Feb 2013 02:58:33 +0000 (18:58 -0800)]
Fix borders
Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e
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
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
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 02:40:09 +0000 (18:40 -0800)]
Fix filters only + geometry only rendering
Change-Id: Id8f0637ae53864488cb931def196ee50ae807f5c
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 18:44:51 +0000 (10:44 -0800)]
Cleanup
Move Canvas to com.android.photos.canvas
Remove workaround for b/
8079561
Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
nicolasroard [Tue, 29 Jan 2013 00:36:46 +0000 (16:36 -0800)]
Refactor filters parameters
- introduce FilterRepresentations
- change filters lifecycle
Change-Id: I9416fca47a334d532a347cd5577795738c870933
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
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