OSDN Git Service
Doris Liu [Thu, 11 Apr 2013 17:09:57 +0000 (10:09 -0700)]
am
1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce
* commit '
1f60d9cd60e01da716a736803994ce14016947ac':
Fix camera preview being squished
Doris Liu [Thu, 11 Apr 2013 17:07:25 +0000 (17:07 +0000)]
Merge "Fix camera preview being squished" into gb-ub-photos-bryce
Ruben Brunk [Thu, 11 Apr 2013 03:40:43 +0000 (20:40 -0700)]
am
41185c4f: Fix downsampling check in crop.
* commit '
41185c4fdbccad17b79697306a7f8044b8f7ffd3':
Fix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 00:27:33 +0000 (17:27 -0700)]
Fix downsampling check in crop.
Bug:
8586301
Change-Id: I4c5441f779122adb984368609cfea39a60190848
Doris Liu [Wed, 10 Apr 2013 23:43:43 +0000 (16:43 -0700)]
Fix camera preview being squished
Bug:
8585407
Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd
Baligh Uddin [Wed, 10 Apr 2013 19:59:28 +0000 (12:59 -0700)]
am
27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
27b9459f3764d45d46092aa541e691ff861e0aff':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:59:27 +0000 (12:59 -0700)]
am
ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
ba81a885844c3a04e58f70f6eed90de01b5ea44e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:58:12 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 10 Apr 2013 19:57:27 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 10 Apr 2013 19:39:42 +0000 (19:39 +0000)]
Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
Baligh Uddin [Wed, 10 Apr 2013 18:54:22 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0bf928fbe2856bb3519c3586fb91422ee87da533
Auto-generated-cl: translation import
Baligh Uddin [Wed, 10 Apr 2013 18:52:19 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d953d7ca29bd4ffd4ba96270845448fb6c3d194
Auto-generated-cl: translation import
Bobby Georgescu [Wed, 10 Apr 2013 18:46:56 +0000 (11:46 -0700)]
Correctly scale images in MTP importer
Bug:
8293048
Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
Ruben Brunk [Wed, 10 Apr 2013 18:47:38 +0000 (18:47 +0000)]
Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
ztenghui [Wed, 10 Apr 2013 18:19:57 +0000 (18:19 +0000)]
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
ztenghui [Mon, 8 Apr 2013 21:37:53 +0000 (14:37 -0700)]
Use MediaMuxer for the video trim and mute.
bug:
8548085
Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
Angus Kong [Wed, 10 Apr 2013 17:35:58 +0000 (17:35 +0000)]
Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
nicolasroard [Wed, 10 Apr 2013 15:20:26 +0000 (08:20 -0700)]
Small cleanup in setting resources
Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
Ruben Brunk [Wed, 10 Apr 2013 07:11:46 +0000 (00:11 -0700)]
Adding simple crop ui. Refactoring.
Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540
nicolasroard [Wed, 10 Apr 2013 01:43:31 +0000 (18:43 -0700)]
Add a third pipeline reserved for the high res preview
Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
Angus Kong [Mon, 8 Apr 2013 23:57:57 +0000 (16:57 -0700)]
Refactor CameraDataAdapter for other data types.
Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
John Hoford [Wed, 10 Apr 2013 00:56:32 +0000 (00:56 +0000)]
Merge "support icon styles" into gb-ub-photos-bryce
nicolasroard [Wed, 10 Apr 2013 00:52:08 +0000 (17:52 -0700)]
Detach old editor
Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
John Hoford [Wed, 10 Apr 2013 00:47:24 +0000 (17:47 -0700)]
support icon styles
Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
nicolasroard [Tue, 9 Apr 2013 23:40:34 +0000 (23:40 +0000)]
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
Ruben Brunk [Tue, 9 Apr 2013 23:07:35 +0000 (16:07 -0700)]
Fix to imports in NewPhotoModule.
Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef
Ruben Brunk [Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)]
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
Ruben Brunk [Fri, 5 Apr 2013 00:20:42 +0000 (17:20 -0700)]
Moving crop to a separate activity. Refactoring.
Bug:
8526929
Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
nicolasroard [Tue, 9 Apr 2013 22:29:35 +0000 (15:29 -0700)]
Implements swipe in editor menu
Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
Angus Kong [Tue, 9 Apr 2013 21:49:55 +0000 (21:49 +0000)]
Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
Angus Kong [Tue, 9 Apr 2013 21:09:38 +0000 (21:09 +0000)]
Merge "Refresh parameters during recording." into gb-ub-photos-bryce
Angus Kong [Wed, 3 Apr 2013 23:56:18 +0000 (16:56 -0700)]
Refresh parameters during recording.
bug:
8504803
Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
nicolasroard [Tue, 9 Apr 2013 20:33:04 +0000 (20:33 +0000)]
Merge "Hide the category panel when editing" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 18:46:53 +0000 (11:46 -0700)]
Hide the category panel when editing
Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96
John Hoford [Tue, 9 Apr 2013 20:02:06 +0000 (20:02 +0000)]
Merge "ui cleanup" into gb-ub-photos-bryce
John Hoford [Tue, 9 Apr 2013 18:51:42 +0000 (11:51 -0700)]
ui cleanup
Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
Bobby Georgescu [Mon, 8 Apr 2013 17:14:14 +0000 (10:14 -0700)]
Remove unneeded READ_SMS permission
Bug:
8469283
Change-Id: I0d211705fe1fb86dc0ce85230e82d500f0202291
Doris Liu [Fri, 15 Mar 2013 04:01:35 +0000 (21:01 -0700)]
Work in progress - Put preview in TextureView
Fixed gesture recognizing and pie menu.
Fixed camera picker. Exposure setting got fixed with rebasing.
Rebased for new pie menu
Fixed camera mode switch listener
Ongoing: secure album, aspect ratio for video recording on ICS
Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
nicolasroard [Tue, 9 Apr 2013 16:46:17 +0000 (09:46 -0700)]
Fix panel color background in landscape
Change-Id: Id1a0470c8df5fe39f5504a43e1602672ac0d584d
nicolasroard [Tue, 9 Apr 2013 15:57:59 +0000 (08:57 -0700)]
Fix history original image
Change 1st and 2nd panel background color
Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
nicolasroard [Tue, 9 Apr 2013 15:18:18 +0000 (08:18 -0700)]
Fix history panel first appearance
Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22
nicolasroard [Tue, 9 Apr 2013 03:54:45 +0000 (20:54 -0700)]
Fix positioning of cancel/done buttons
Change-Id: Ie229a20d882841444ece28a3ab63cbc6ea916699
nicolasroard [Tue, 9 Apr 2013 03:07:47 +0000 (20:07 -0700)]
Fix crash in curves
Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
John Hoford [Tue, 9 Apr 2013 02:32:45 +0000 (19:32 -0700)]
make basic editor based on ParametricEditor
Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61
nicolasroard [Tue, 9 Apr 2013 02:06:51 +0000 (19:06 -0700)]
Deactivate Vintage & BW Color FX
bug:
8503451
Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587
nicolasroard [Tue, 9 Apr 2013 01:50:45 +0000 (01:50 +0000)]
Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 01:16:17 +0000 (18:16 -0700)]
Add menu item to start the simple editor
Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
Bart Sears [Tue, 9 Apr 2013 01:12:07 +0000 (18:12 -0700)]
Bump up the version number to 1.1.40009
Change-Id: Ia266e6493a535cd4ae36fda2fa497195b810ebb4
Tim Murray [Mon, 8 Apr 2013 22:02:01 +0000 (22:02 +0000)]
Merge "Allow use of texture." into gb-ub-photos-bryce
Tim Murray [Mon, 8 Apr 2013 22:01:53 +0000 (22:01 +0000)]
Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce
Tim Murray [Mon, 8 Apr 2013 21:33:51 +0000 (14:33 -0700)]
Allow use of texture.
Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf
Tim Murray [Mon, 8 Apr 2013 17:35:09 +0000 (10:35 -0700)]
Limit creation of greyscale converter RS script.
Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067
Angus Kong [Fri, 5 Apr 2013 18:17:19 +0000 (11:17 -0700)]
Add more gestures and animations in FilmStripView.
Now supports fullscreen mode and filmstrip mode.
Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f
John Hoford [Mon, 8 Apr 2013 19:40:17 +0000 (12:40 -0700)]
Increase the CHAR LIMIT for color_pick_select
bug:
8131770
Change-Id: I665316d3ff6ec10fcace8ee1bb9237f4057a4797
John Hoford [Fri, 5 Apr 2013 15:48:39 +0000 (08:48 -0700)]
support for simplified computed icons
Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd
Bart Sears [Fri, 5 Apr 2013 23:51:42 +0000 (23:51 +0000)]
Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce
Ruben Brunk [Fri, 5 Apr 2013 23:22:55 +0000 (16:22 -0700)]
Added check to strip out uninitialized EXIF tags.
Bug:
8552339
Change-Id: Ib6ae4f59f9e393e5f6b46877a4b2c3b2fe1852d3
Bart Sears [Fri, 5 Apr 2013 21:55:58 +0000 (14:55 -0700)]
Bump up the version number to 1.1.40008
Change-Id: I42dce1bc936b54a4d4f72c2179d2f1d9e27f72d7
Baligh Uddin [Fri, 5 Apr 2013 19:02:11 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 5 Apr 2013 18:34:17 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e919072c23a9b7d081416f1f55dd5991381a56b
Auto-generated-cl: translation import
Michael Kolb [Fri, 5 Apr 2013 17:08:40 +0000 (17:08 +0000)]
Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 5 Apr 2013 16:52:55 +0000 (09:52 -0700)]
Don't add unsupported options to menu
Bug:
8549712
Exposure compensation and whitebalance were not checked when added
to the menu.
Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df
ztenghui [Thu, 4 Apr 2013 22:57:41 +0000 (22:57 +0000)]
Merge "Remove redudant setName" into gb-ub-photos-bryce
Bart Sears [Thu, 4 Apr 2013 22:07:12 +0000 (15:07 -0700)]
Bump up the version number to 1.1.40007
Change-Id: Ia494e2c210f642ec0232394d0cfabaf5e1b8f96a
ztenghui [Thu, 4 Apr 2013 17:28:43 +0000 (10:28 -0700)]
Remove redudant setName
Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c
John Hoford [Thu, 4 Apr 2013 15:42:50 +0000 (15:42 +0000)]
Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
John Hoford [Wed, 3 Apr 2013 23:53:04 +0000 (16:53 -0700)]
fixed the value that quality was getting set to
Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4
Michael Kolb [Wed, 3 Apr 2013 23:09:48 +0000 (23:09 +0000)]
Merge "Adjust camera menu further" into gb-ub-photos-bryce
Angus Kong [Wed, 3 Apr 2013 22:41:53 +0000 (22:41 +0000)]
Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce
Michael Kolb [Tue, 2 Apr 2013 23:03:04 +0000 (16:03 -0700)]
Adjust camera menu further
Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
Baligh Uddin [Wed, 3 Apr 2013 21:58:43 +0000 (21:58 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 3 Apr 2013 21:56:08 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Doris Liu [Wed, 3 Apr 2013 00:48:56 +0000 (17:48 -0700)]
Improve black bar to keep camera controls in place
Bug:
8340996
Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
Baligh Uddin [Wed, 3 Apr 2013 18:39:53 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I67a90d5cfd30f854cda228e0a5f54cd640813e16
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Apr 2013 18:37:40 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3d22344797079b775de3781b0e3d8b73623dcec9
Auto-generated-cl: translation import
John Hoford [Wed, 3 Apr 2013 17:58:40 +0000 (10:58 -0700)]
fix touch action in draw
Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d
Angus Kong [Wed, 3 Apr 2013 00:59:30 +0000 (17:59 -0700)]
Don't access mParameters dirty bit in other thread
Change-Id: I067dd56975cc908f29ed7ba419572982c55b2063
nicolasroard [Wed, 3 Apr 2013 05:22:37 +0000 (22:22 -0700)]
Fix segfaults in RS filters
We did not recreate the filters in all
cases when the input size change.
bug:
8530112
Change-Id: I4cb47498532618271b90e56c01ec63ad991db787
Ruben Brunk [Tue, 2 Apr 2013 23:47:03 +0000 (23:47 +0000)]
Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
John Hoford [Tue, 2 Apr 2013 23:44:40 +0000 (23:44 +0000)]
Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
Angus Kong [Tue, 2 Apr 2013 23:05:03 +0000 (23:05 +0000)]
Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
John Hoford [Tue, 2 Apr 2013 22:55:55 +0000 (15:55 -0700)]
fix calling Allocation.copyFrom without context
bug:
8526929
Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
Ruben Brunk [Tue, 2 Apr 2013 20:15:57 +0000 (13:15 -0700)]
Speed improvements for ExifOutputStream.
Change-Id: I7d3ee9c157aefe67734e7b49cfa7868254c134ef
Ruben Brunk [Tue, 2 Apr 2013 22:19:05 +0000 (22:19 +0000)]
Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
Angus Kong [Tue, 2 Apr 2013 21:56:43 +0000 (14:56 -0700)]
Make stopPreview synchronous.
bug:
8517092
Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
Ruben Brunk [Tue, 2 Apr 2013 21:16:22 +0000 (14:16 -0700)]
Cleanup sloppy memory handling in ExifOutputStream.
Change-Id: Ifc34a958a6214fa89ee52cfbdeb6d53baa8cd3fd
Bobby Georgescu [Tue, 2 Apr 2013 20:09:50 +0000 (20:09 +0000)]
Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 1 Apr 2013 22:33:17 +0000 (15:33 -0700)]
Usage statistics for photo and video capture
Bug:
8433834
Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
nicolasroard [Tue, 2 Apr 2013 04:33:20 +0000 (21:33 -0700)]
Fix stickiness issues with UI
The renderGeometryIcon() function shouldn't
be synchronized -- it's independent of the rest
of the pipeline and is only used to apply a given geometry.
Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3
nicolasroard [Tue, 2 Apr 2013 04:33:20 +0000 (21:33 -0700)]
Don't try freeing resources on a different thread..
This call to freeResources happens on the main thread.
It's also not really useful. The geometry instance
shouldn't be shared either.
bug:
8522497
Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4
Ruben Brunk [Tue, 2 Apr 2013 00:26:42 +0000 (17:26 -0700)]
Changed editor back button behavior.
Bug:
8522150
Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b
Ruben Brunk [Tue, 2 Apr 2013 00:00:01 +0000 (00:00 +0000)]
Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
Ruben Brunk [Mon, 1 Apr 2013 23:55:05 +0000 (16:55 -0700)]
Change panels organization. Also fixes border updates handling.
Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
Michael Kolb [Mon, 1 Apr 2013 23:46:06 +0000 (23:46 +0000)]
Merge "Pie design update" into gb-ub-photos-bryce
Michael Kolb [Tue, 12 Mar 2013 17:24:42 +0000 (10:24 -0700)]
Pie design update
Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
Angus Kong [Mon, 1 Apr 2013 23:13:16 +0000 (23:13 +0000)]
Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
Ruben Brunk [Mon, 1 Apr 2013 23:07:42 +0000 (23:07 +0000)]
Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 22:59:09 +0000 (15:59 -0700)]
Handle InterruptedException in waitDone
Dirty bit for mParameters should be set properly if getParameters is not
finished.
bug:
8517092
Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0
Angus Kong [Mon, 1 Apr 2013 22:17:30 +0000 (22:17 +0000)]
Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 21:30:30 +0000 (14:30 -0700)]
Don't use SynchronousQueue to pass results.
bug:
8517092
Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d
OSDN Git Service
