OSDN Git Service
John Hoford [Tue, 30 Jul 2013 00:27:30 +0000 (00:27 +0000)]
Merge "add Grad filter" into gb-ub-photos-carlsbad
John Hoford [Sat, 20 Jul 2013 00:11:31 +0000 (17:11 -0700)]
add Grad filter
Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
Angus Kong [Fri, 19 Jul 2013 01:04:19 +0000 (18:04 -0700)]
Refactor CameraManager.
1. CameraManager should be the only class accessing android.hardware.Camera.
2. For potential future upgrade in Camera HAL and android.hardward.Camera API
upgrade, CameraManager should be just an interface instead of concrete
implementation.
3. waitDone() in CameraProxy is removed.
4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are
wrapped by our own interfaces.
Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465
Sascha Haeberling [Sat, 27 Jul 2013 00:20:15 +0000 (00:20 +0000)]
Merge "Refocus integration phase 1." into gb-ub-photos-carlsbad
nicolasroard [Fri, 26 Jul 2013 17:01:06 +0000 (10:01 -0700)]
Fix disappearing fragment
Change-Id: Ic478ad75a458bb36001c91f8627aab7643fa0a47
nicolasroard [Fri, 26 Jul 2013 14:51:29 +0000 (07:51 -0700)]
Fix geometry serialization
Change-Id: I3040cfdb08f6cc6dbd4fd1eb5444b3395a68c7da
Ruben Brunk [Thu, 25 Jul 2013 03:06:20 +0000 (20:06 -0700)]
Added support to export to a flattened photo.
Bug:
10008212
- Adds a menu item to allow a photo with edits to be flattened
into a separate photo.
- Fixes bug where crop intents fail to save cropped images.
Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
Sascha Haeberling [Wed, 24 Jul 2013 01:30:17 +0000 (18:30 -0700)]
Refocus integration phase 1.
Bug:
9966846
Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
Angus Kong [Fri, 19 Jul 2013 21:55:07 +0000 (14:55 -0700)]
Remove legacy code ActivityBase.java.
Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
nicolasroard [Wed, 24 Jul 2013 00:10:18 +0000 (17:10 -0700)]
Fix geometry transform
Change-Id: I0c3af6f4122d045f5a8656bc709127aa7ae2ecab
nicolasroard [Mon, 22 Jul 2013 23:55:44 +0000 (23:55 +0000)]
Merge "Move ImageCurves to the ImageShow package" into gb-ub-photos-carlsbad
nicolasroard [Mon, 22 Jul 2013 21:08:04 +0000 (14:08 -0700)]
Move ImageCurves to the ImageShow package
Change-Id: I458d20df930b9228dcbc60c3ec27f74b152d38cf
ztenghui [Mon, 22 Jul 2013 18:08:28 +0000 (11:08 -0700)]
Fix saving issues with online image.
bug:
9468909
Change-Id: I10762dba307999d87fac08b3a2ce7e104264a813
nicolasroard [Fri, 19 Jul 2013 22:51:46 +0000 (22:51 +0000)]
Merge "Remove FilteringPipeline" into gb-ub-photos-carlsbad
nicolasroard [Fri, 19 Jul 2013 21:45:32 +0000 (14:45 -0700)]
Remove FilteringPipeline
Reorganize things around the filtering service.
- add HighresRenderingTask
- add RenderingRequestTask
- add UpdatePreviewTask
Change-Id: I3da34fee8c624fb55311c3e1639857fc1bcdadad
ztenghui [Fri, 19 Jul 2013 22:19:16 +0000 (22:19 +0000)]
Merge "Update Uri instead of removing" into gb-ub-photos-carlsbad
ztenghui [Thu, 18 Jul 2013 21:40:10 +0000 (14:40 -0700)]
Update Uri instead of removing
In this way, the processing service can have a better presentation.
The cache key now include the file Uri and local abs path if exists.
bug:
9468909
Change-Id: I0919c09ad26bea2e798c99ad376996547f8f2bf8
Angus Kong [Tue, 16 Jul 2013 22:14:58 +0000 (15:14 -0700)]
Add stitching manager in Camera.
Change-Id: I2f27c2c0e77ed3d618df890e709ca09076591f70
Angus Kong [Wed, 17 Jul 2013 22:59:03 +0000 (15:59 -0700)]
Refine MediaSaveService to use memory limit.
Change-Id: Ieeb06eddbd742896ecb7c50f0f51facaa77b2d21
Ruben Brunk [Tue, 16 Jul 2013 01:32:50 +0000 (18:32 -0700)]
Refactoring GeometryMetadata.
Bug:
9170644
- First part of multi-step refactor, splits
GeometryMetadata functionality into 4
FilterRepresentation subclasses as requested.
Change-Id: I212193db8c154f64c550adb9735c0502bcaa7468
John Hoford [Tue, 16 Jul 2013 00:44:31 +0000 (17:44 -0700)]
remove clone
Change-Id: Ia9f4c1778e06416018eeb07be657bcdd0af1496b
John Hoford [Fri, 12 Jul 2013 22:31:09 +0000 (15:31 -0700)]
fix restoring frames
Change-Id: I77a75f3feb8a1affdb579e3c7b196928af1b2bf0
John Reck [Wed, 17 Jul 2013 16:50:01 +0000 (09:50 -0700)]
Fix help for GalleryGoogle builds
Bug:
9886976
Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333
(cherry picked from commit
7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
nicolasroard [Sat, 13 Jul 2013 01:27:54 +0000 (18:27 -0700)]
Add background processing service
bug:
7298624
Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357
ztenghui [Tue, 16 Jul 2013 17:07:23 +0000 (17:07 +0000)]
Merge "Add equality check into FilterCurveRep" into gb-ub-photos-carlsbad
Angus Kong [Tue, 16 Jul 2013 01:22:49 +0000 (01:22 +0000)]
Merge "Remove unnecessary startPreview thread in video." into gb-ub-photos-carlsbad
Angus Kong [Mon, 15 Jul 2013 19:42:41 +0000 (12:42 -0700)]
Remove unnecessary startPreview thread in video.
Change-Id: I42dc46748fad3b321178280069555ecdd5c4a962
ztenghui [Mon, 15 Jul 2013 23:04:32 +0000 (16:04 -0700)]
Add equality check into FilterCurveRep
Consequently add equality check support in Spline and ControlPoint.
bug:
9468909
Change-Id: I8078b994beac4056ca92e76da0e15d618389e56e
ztenghui [Mon, 15 Jul 2013 21:18:08 +0000 (14:18 -0700)]
FilterDirectRepresentation always should be considered as has modification.
Therefore isNil should be false.
bug:
9468909
Change-Id: I9946d060e7a1c73b6dc27c73d8f3b7986343de98
Ruben Brunk [Sat, 13 Jul 2013 00:23:39 +0000 (17:23 -0700)]
Combine ImageLoader and CropLoader utility classes.
Bug:
9356969
Bug:
9170644
- Refactor to eliminate code duplication in image loading classes.
- Fix bugs caused by the inability to determine MIME types for images
that aren't in Gallery's content provider (causes b/
9356969).
Change-Id: I30c2ba5c0cd37aac624681a2cec9abddaa78f9c2
Doris Liu [Fri, 12 Jul 2013 17:35:03 +0000 (17:35 +0000)]
Merge "Use ValueAnimator to ensure callbacks get called" into gb-ub-photos-carlsbad
Doris Liu [Thu, 11 Jul 2013 23:32:13 +0000 (16:32 -0700)]
Use ValueAnimator to ensure callbacks get called
Bug:
9597743
Change-Id: I6b119bb7a6f8bbba76ccc09c28293eb7b5a0457e
Ruben Brunk [Sat, 29 Jun 2013 03:02:54 +0000 (20:02 -0700)]
Added jpeg streaming classes.
- Provides streaming operations for decompressing/compressing
JPEG files.
- Allows pixel operations to be performed on large JPEG images
without holding the entire bitmap in memory.
Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
Ruben Brunk [Tue, 9 Jul 2013 01:11:49 +0000 (18:11 -0700)]
Refactoring ImageLoader.
- Moves state (history, loadlisteners, bitmaps, etc.)
from ImageLoader to MasterImage.
- Makes ImageLoader into a utility class.
Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c
nicolasroard [Thu, 11 Jul 2013 01:57:08 +0000 (18:57 -0700)]
Fix selection in categories
Change-Id: Ica9ff5ba4a6d195f8b1ea1a686e9bbc6772d655f
nicolasroard [Wed, 10 Jul 2013 23:14:51 +0000 (16:14 -0700)]
Fix state panel
Labels were not reflecting looks changes
bug:
9746512
Change-Id: Ia2dd2a760f38dbd48c8a4d43e3d46ee2b875771f
Angus Kong [Tue, 9 Jul 2013 16:30:32 +0000 (09:30 -0700)]
Measure children after the dimension is determined.
Also, the setMeasuredDimension() in onMeasure() is not necessary as we already
called super.
bug:
9680271
Change-Id: I639454e515edb3027c9e79347d2124a1fcaa529b
nicolasroard [Wed, 3 Jul 2013 17:22:26 +0000 (10:22 -0700)]
Remove FilterIconButton
Change-Id: Ie1d7c4e8d3f397323f702eba2809f2589b8071f0
nicolasroard [Wed, 3 Jul 2013 01:25:06 +0000 (01:25 +0000)]
Merge "Improves portrait categories buttons" into gb-ub-photos-carlsbad
nicolasroard [Wed, 3 Jul 2013 00:54:05 +0000 (17:54 -0700)]
Improves portrait categories buttons
- use only CategoryView, no FilterIconButton
- add xml values for the font size/margins
- for now reuse the same Action bitmap
- add accessibility contentDescription
Change-Id: Ic1ae8015abba27bea0b3c4a2bccbd1a7c9ff4731
ztenghui [Fri, 28 Jun 2013 00:14:41 +0000 (17:14 -0700)]
Try to restore the original file instead of copying when appropiate.
bug:
9468909
Change-Id: I09ac244459389b0fdf6f64a79987c176ba8756d8
nicolasroard [Tue, 2 Jul 2013 22:46:23 +0000 (15:46 -0700)]
Move classes to pipeline package
Change-Id: I9d664537d845d9daeb352c8006d0296a3f546dca
nicolasroard [Tue, 2 Jul 2013 22:33:24 +0000 (15:33 -0700)]
Fix crash in geometry
Change-Id: I4c9292b539643f2e2738d788dcb58f0a129254f9
nicolasroard [Tue, 2 Jul 2013 22:02:43 +0000 (15:02 -0700)]
Speed up load times
Compute the small res image on the fly
Load the high res preview image after first load
Change-Id: Icc556c2204cb4fd25766d90064a5756c877b11cc
nicolasroard [Tue, 2 Jul 2013 20:21:31 +0000 (13:21 -0700)]
Add stop check in ImageFilterFX
speed up switching / interrupting of rendering.
Change-Id: I3ef4b1d16047b00a062c86d72cdfff2bfe9817a2
nicolasroard [Tue, 2 Jul 2013 19:45:17 +0000 (19:45 +0000)]
Merge "Pipeline refactoring" into gb-ub-photos-carlsbad
nicolasroard [Tue, 2 Jul 2013 18:00:01 +0000 (11:00 -0700)]
Pipeline refactoring
Remove the temp representations and instead use a triple
buffer for ImagePresets.
Change-Id: I4cdcfbe4941af72b38fe42385085ff4a20eb78cc
Doris Liu [Tue, 2 Jul 2013 19:03:32 +0000 (12:03 -0700)]
Add in carlsbad: Avoid duplicated location popups
Bug:
9505556
Change-Id: I00859d8d851ea3c75d3bda4fcf5df373f06c2ee0
nicolasroard [Mon, 1 Jul 2013 23:58:51 +0000 (16:58 -0700)]
Pipeline refactoring
Add SharedBuffer and Buffer class
Change-Id: I823a9520541e3be5321a3deb5e58a358588b6cf3
ztenghui [Mon, 1 Jul 2013 23:42:03 +0000 (23:42 +0000)]
Merge "Fix the save button issue." into gb-ub-photos-carlsbad
ztenghui [Fri, 28 Jun 2013 16:25:23 +0000 (09:25 -0700)]
Fix the save button issue.
When dealing with non Fx filters, the hasModification() really need to go deep
to figure out whether things has changed.
bug:
9468909
Change-Id: I89495f147f7af7c35490def84805aae98e3f917f
George Mount [Mon, 1 Jul 2013 20:02:52 +0000 (13:02 -0700)]
Ensure no account duplicates.
Bug
9502314
Add a uniqueness constraint to account name.
Change-Id: I1f0607e5ce9b90054b3b98bed1557b223d7e89a7
ztenghui [Fri, 28 Jun 2013 16:27:56 +0000 (16:27 +0000)]
Merge "Add a switch to turn on/off the aux directory saving" into gb-ub-photos-carlsbad
ztenghui [Thu, 27 Jun 2013 22:46:39 +0000 (15:46 -0700)]
Add a switch to turn on/off the aux directory saving
bug:
9468909
Change-Id: Iaecda20a74a02556d883f0e97250e9ec4d856677
John Hoford [Fri, 28 Jun 2013 00:33:52 +0000 (17:33 -0700)]
small bug in reading presets
Change-Id: I791a8407d72b92f5e46a33c254d44747308b2ba5
nicolasroard [Thu, 27 Jun 2013 21:41:58 +0000 (14:41 -0700)]
Refactor HistoryAdapter
- Remove the adapter part
- Rename into HistoryManager
Change-Id: I58de5661770f8796882ff4a633aec700bd8bc1a5
ztenghui [Mon, 24 Jun 2013 20:54:04 +0000 (13:54 -0700)]
Save button now behaves correctly for filter changes.
Basically, save the original filter from the file's XMP.
Compare the current filter against original one to decide whether or not the
file has been modified and needed to be saved.
At the same time, make sure we don't save "None" filter in the ImagePreset.
bug:
9468909
Change-Id: I5b86ab95556b6b010367c9577b02c0bb42ffb824
nicolasroard [Thu, 27 Jun 2013 21:12:17 +0000 (14:12 -0700)]
Move history classes to their own package
Change-Id: Ib4f50c56b445788cad3b973673008d8a89244867
nicolasroard [Thu, 27 Jun 2013 19:45:39 +0000 (19:45 +0000)]
Merge "Fix selected frame in looks and borders" into gb-ub-photos-carlsbad
Bart Sears [Thu, 27 Jun 2013 18:46:07 +0000 (18:46 +0000)]
Merge "Bump up the version number to 1.1.40030" into gb-ub-photos-carlsbad
nicolasroard [Tue, 25 Jun 2013 23:32:01 +0000 (16:32 -0700)]
Fix selected frame in looks and borders
Change-Id: Id1839a028f3044929043d7c910df30a1fcabdda1
Bart Sears [Thu, 27 Jun 2013 18:37:23 +0000 (11:37 -0700)]
Bump up the version number to 1.1.40030
Change-Id: I391e9515e50ec9d61855f4e939b4033dad648ac5
nicolasroard [Wed, 26 Jun 2013 23:56:31 +0000 (16:56 -0700)]
ImagePreset cleanup
Get rid of remaining ivars related to history
Change-Id: Ic106ef6a96f4727c6dd46d7be3d059bdc42e5a2a
John Hoford [Thu, 27 Jun 2013 01:18:44 +0000 (18:18 -0700)]
fix icon repaint on simple load
Change-Id: I841475949e67b63fd3d24a2267fda9f2e450898d
John Hoford [Thu, 27 Jun 2013 00:32:46 +0000 (00:32 +0000)]
Merge "support non destructive edits of Curves" into gb-ub-photos-carlsbad
nicolasroard [Thu, 27 Jun 2013 00:18:03 +0000 (17:18 -0700)]
Fix tot
Change-Id: I75b28ac56f9c3b295280690078f5c854fda7eb66
John Hoford [Mon, 24 Jun 2013 22:13:13 +0000 (15:13 -0700)]
support non destructive edits of Curves
Change-Id: I597be6570a17072a4116bf6227a6a35796266bc3
nicolasroard [Wed, 26 Jun 2013 23:05:11 +0000 (23:05 +0000)]
Merge "Cleanup in ImagePreset" into gb-ub-photos-carlsbad
nicolasroard [Wed, 26 Jun 2013 21:33:15 +0000 (14:33 -0700)]
Cleanup in ImagePreset
Move GeometryMetadata to the list of filters
Change-Id: I0bef13ca0d9cb41e68eddd108000ff7bd426b313
Michael Kolb [Wed, 26 Jun 2013 21:36:35 +0000 (21:36 +0000)]
Merge "Clean up PreviewGestures" into gb-ub-photos-carlsbad
Michael Kolb [Wed, 26 Jun 2013 21:27:56 +0000 (14:27 -0700)]
Clean up PreviewGestures
- remove dead code and state
- fix zoom only mode during video recording
Change-Id: I2238f99b9823ba091d300046d07448c67bc2ad78
ztenghui [Wed, 26 Jun 2013 21:26:55 +0000 (21:26 +0000)]
Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbad
Angus Kong [Wed, 26 Jun 2013 20:55:12 +0000 (20:55 +0000)]
Merge "Add fullscreen mode." into gb-ub-photos-carlsbad
ztenghui [Wed, 26 Jun 2013 20:54:17 +0000 (13:54 -0700)]
Fix ambiguous naming and typo
bug:
9468909
Change-Id: Ic52f3b6f6b5d0c874e8291ce7b3a76cb6c22f60f
Angus Kong [Tue, 18 Jun 2013 23:47:57 +0000 (16:47 -0700)]
Add fullscreen mode.
1. Single tap to center a picture.
2. Double tap to fullscreen
3. In fullscreen, the next picture is on the left but the previous one
is under the current one.
Change-Id: I728da2487ea649162be4f1858a8524331c625157
Angus Kong [Wed, 26 Jun 2013 18:32:17 +0000 (18:32 +0000)]
Merge "Fix check of failing decoding boundaries calls" into gb-ub-photos-carlsbad
Angus Kong [Wed, 26 Jun 2013 18:25:09 +0000 (11:25 -0700)]
Fix check of failing decoding boundaries calls
Change-Id: I7b7780de9988312f9ce79c2a27132b7f6acb1c4e
nicolasroard [Wed, 26 Jun 2013 01:24:57 +0000 (01:24 +0000)]
Merge "Cleanup ImagePreset to remove special-casing for borders" into gb-ub-photos-carlsbad
nicolasroard [Wed, 26 Jun 2013 00:06:54 +0000 (17:06 -0700)]
Cleanup ImagePreset to remove special-casing
for borders
Change-Id: I6410a7a44d72c3dfa51c1d18f5a6fcba854ba9c2
Angus Kong [Tue, 25 Jun 2013 20:33:01 +0000 (13:33 -0700)]
Don't use post-ICS API View.setBackground().
View.setBackground() is API level 16.
Change-Id: I7e56939efbcaa6e152c19c37a4a54a133bed3b47
Angus Kong [Tue, 25 Jun 2013 18:12:16 +0000 (11:12 -0700)]
Synchronize camera access in start preview thread.
Change-Id: Iba953fea3bd17ecb085d75fb3b2e350c0bf5d3b1
Doris Liu [Tue, 25 Jun 2013 01:37:47 +0000 (01:37 +0000)]
Merge "Clean up camera switcher" into gb-ub-photos-carlsbad
ztenghui [Tue, 25 Jun 2013 00:32:10 +0000 (00:32 +0000)]
Merge "Fix the missing filter name after deserialization." into gb-ub-photos-carlsbad
ztenghui [Mon, 24 Jun 2013 23:34:26 +0000 (16:34 -0700)]
Fix the missing filter name after deserialization.
bug:
9468909
Change-Id: I63aaf0bad02c2afdddf9b162f695fc0a9165befa
Doris Liu [Mon, 24 Jun 2013 22:29:54 +0000 (15:29 -0700)]
Clean up camera switcher
Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
nicolasroard [Mon, 24 Jun 2013 20:38:56 +0000 (20:38 +0000)]
Merge "Add a MatrixFit class" into gb-ub-photos-carlsbad
Bobby Georgescu [Fri, 21 Jun 2013 21:57:59 +0000 (21:57 +0000)]
Merge "MTP Importer: show overlay icon on video items" into gb-ub-photos-carlsbad
Doris Liu [Fri, 21 Jun 2013 21:11:50 +0000 (21:11 +0000)]
Merge "Remove SRI panorama" into gb-ub-photos-carlsbad
Bobby Georgescu [Fri, 21 Jun 2013 20:43:05 +0000 (13:43 -0700)]
MTP Importer: show overlay icon on video items
Bug:
4099088
Change-Id: Ia785f889aff91329e9d7c7026238b2588336963d
Doris Liu [Fri, 21 Jun 2013 01:32:26 +0000 (18:32 -0700)]
Remove SRI panorama
Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
Bobby Georgescu [Thu, 20 Jun 2013 18:55:06 +0000 (11:55 -0700)]
MTP Importer: improve experience when importing large files
Bug:
4099088
Change-Id: Ie5d9da1be0b8891b9123eceaadfe9c2ec2d3e408
Bobby Georgescu [Thu, 20 Jun 2013 01:01:30 +0000 (01:01 +0000)]
Merge "Add support for importing videos in MTP importer" into gb-ub-photos-carlsbad
Bobby Georgescu [Mon, 17 Jun 2013 20:38:30 +0000 (13:38 -0700)]
Add support for importing videos in MTP importer
Bug:
4099088
Change-Id: Ic3ac00cb730381dd2d7f4802aa8001a60e439748
ztenghui [Wed, 19 Jun 2013 22:41:25 +0000 (22:41 +0000)]
Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbad
ztenghui [Wed, 19 Jun 2013 22:41:05 +0000 (22:41 +0000)]
Merge "Setup the saving framework to support hiding original photo for editor." into gb-ub-photos-carlsbad
Doris Liu [Wed, 19 Jun 2013 21:20:51 +0000 (14:20 -0700)]
Add flash animation to photo module
Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
ztenghui [Wed, 19 Jun 2013 21:16:14 +0000 (14:16 -0700)]
Fix LUT3D information lost after re-edit
bug:
9427243
Change-Id: I8535c8776c866fd6c84d391a8de82df9cb214694
nicolasroard [Wed, 19 Jun 2013 18:36:46 +0000 (11:36 -0700)]
Add a MatrixFit class
Change-Id: I67d2eb92fe5bbdff56ff50330c7eed48e7593f75
ztenghui [Mon, 10 Jun 2013 22:51:42 +0000 (15:51 -0700)]
Setup the saving framework to support hiding original photo for editor.
This new approach will try to hide the original image into an auxiliary
directory. User will only see one edited image, while being able to go
back to the original image in the editor.
Refactor SaveCopyTask for more private funcs and more comments.
bug:
9468909
Change-Id: I866321d23e6db0b3dbd08fec2a6a7e3142b17b65
Doris Liu [Wed, 19 Jun 2013 00:14:26 +0000 (17:14 -0700)]
Set window flags to show secure camera
Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74