OSDN Git Service
John Hoford [Sat, 10 Aug 2013 00:44:01 +0000 (00:44 +0000)]
Merge "fix draw" into gb-ub-photos-carlsbad
John Hoford [Mon, 5 Aug 2013 22:07:14 +0000 (15:07 -0700)]
fix draw
Change-Id: I535221edd992c1a8c659c398dba61158e0c1d87d
nicolasroard [Fri, 9 Aug 2013 20:56:35 +0000 (13:56 -0700)]
Fix histogram view
Change-Id: Ic0c3a1103f5fa1f0ef1e72ae92fecfcb343bad74
nicolasroard [Fri, 9 Aug 2013 20:48:26 +0000 (20:48 +0000)]
Merge "Add shadow" into gb-ub-photos-carlsbad
nicolasroard [Fri, 9 Aug 2013 20:16:10 +0000 (13:16 -0700)]
Add shadow
Change-Id: Iba10c5d01bad8f0f49986150b2b4f6cf905be3cb
John Reck [Fri, 9 Aug 2013 16:50:06 +0000 (16:50 +0000)]
Merge "Sync latest TiledImageView" into gb-ub-photos-carlsbad
nicolasroard [Fri, 9 Aug 2013 14:09:56 +0000 (14:09 +0000)]
Merge "Add version category Fix bugs when loading Add info panel" into gb-ub-photos-carlsbad
nicolasroard [Fri, 9 Aug 2013 03:47:28 +0000 (20:47 -0700)]
Add version category
Fix bugs when loading
Add info panel
Change-Id: I28966f2419b902405bc60e9cc927b109777a6a2d
Sascha Haeberling [Thu, 8 Aug 2013 18:27:09 +0000 (11:27 -0700)]
Remove Camera from Gallery2.
Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590
John Reck [Thu, 8 Aug 2013 21:16:24 +0000 (14:16 -0700)]
Sync latest TiledImageView
Change-Id: I57e040a05e0ae4c1886eda014f1e6bf750612a3e
ztenghui [Wed, 7 Aug 2013 23:33:32 +0000 (23:33 +0000)]
Merge "WAR the crash from re-editing missing online image" into gb-ub-photos-carlsbad
nicolasroard [Thu, 1 Aug 2013 23:22:30 +0000 (16:22 -0700)]
Fix full res zoom
Also add filters merging in the cache.
Change-Id: Ic34c918b732159f3703cd83d30de907fdbbcb451
George Mount [Wed, 7 Aug 2013 18:00:46 +0000 (18:00 +0000)]
Merge "Move PanoramaViewHelper out of LightCycleHelper" into gb-ub-photos-carlsbad
George Mount [Wed, 7 Aug 2013 18:00:14 +0000 (18:00 +0000)]
Merge "Remove MediaCache and MediaCacheUtils." into gb-ub-photos-carlsbad
George Mount [Wed, 7 Aug 2013 17:59:46 +0000 (17:59 +0000)]
Merge "Remove BitmapDecoder, which is now unused." into gb-ub-photos-carlsbad
George Mount [Tue, 6 Aug 2013 23:07:17 +0000 (16:07 -0700)]
Move PanoramaViewHelper out of LightCycleHelper
PanoramaViewHelper can be used outside of LightCycle panorama
picture creation.
Change-Id: I40bb357385fa311f9115dffaa143119cfcb5f45f
Doris Liu [Wed, 7 Aug 2013 00:29:30 +0000 (17:29 -0700)]
Fix crash on camera startup
Change-Id: Ic4f91d32d5ee4a01c2c406d1592aa0705db413ea
George Mount [Tue, 6 Aug 2013 20:39:38 +0000 (13:39 -0700)]
Remove MediaCache and MediaCacheUtils.
Change-Id: Iebf4b10ecde56bc490a1b5a4add31a1cf766e9c9
George Mount [Tue, 6 Aug 2013 19:58:58 +0000 (12:58 -0700)]
Remove BitmapDecoder, which is now unused.
Change-Id: I01938fac23f212021bc9b7ebe649f40b7dae372a
Angus Kong [Tue, 6 Aug 2013 19:51:37 +0000 (19:51 +0000)]
Merge "Show PhotoSphere stitching progress." into gb-ub-photos-carlsbad
Angus Kong [Tue, 6 Aug 2013 19:40:20 +0000 (19:40 +0000)]
Merge "Show newly recorded video." into gb-ub-photos-carlsbad
Angus Kong [Wed, 31 Jul 2013 22:36:33 +0000 (15:36 -0700)]
Show newly recorded video.
bug:
10115177
Change-Id: I5f9687b358e43e2e98f7b24a03dc8a17cc772433
Doris Liu [Tue, 6 Aug 2013 18:15:55 +0000 (18:15 +0000)]
Merge "Implement capture animation" into gb-ub-photos-carlsbad
Angus Kong [Wed, 31 Jul 2013 21:38:22 +0000 (14:38 -0700)]
Show PhotoSphere stitching progress.
Change-Id: I35a835f3a9bc28d5f974e318ec3ed257ad8bea37
Doris Liu [Mon, 24 Jun 2013 18:30:24 +0000 (11:30 -0700)]
Implement capture animation
Also fix the thumb view by using real jpeg data rather than a preview frame
Bug:
10074619
Change-Id: Ie38884b30977c350b2ca0e0671bd9f5b10d3681e
Angus Kong [Mon, 5 Aug 2013 22:30:05 +0000 (15:30 -0700)]
Load the FilmStrip data in onCreate()
The loading should be done in onCreate() so it won't waste time loading the data
which has been loaded everytime the app is brought to the foreground.
bug:
10189998
Change-Id: I5b9158b206f96b065f6f18a5ab7da3ca14b9e52a
Jason Noguchi [Sat, 3 Aug 2013 00:17:06 +0000 (00:17 +0000)]
Merge "Clean up the test tags used by the continuous test service to determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context." into gb-ub-photos-carlsbad
Jason Noguchi [Wed, 31 Jul 2013 21:16:31 +0000 (14:16 -0700)]
Clean up the test tags used by the continuous test service to determine which
tests to run on every dev build. Add SmallTest or MediumTest tags for unit
tests that are currently being skipped and remove LargeTest tags from long
running stress tests which are not necessary in this context.
Change-Id: I2d3db31b0800dcbed42c881c5eaa589517fd9f87
nicolasroard [Fri, 2 Aug 2013 18:35:32 +0000 (11:35 -0700)]
Fix display bug with highres
Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
Ruben Brunk [Fri, 2 Aug 2013 02:05:18 +0000 (19:05 -0700)]
Add quality selector to export.
- Adds the option to change the quality of the jpeg compression
when flattening an exported bitmap.
Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
Sascha Haeberling [Fri, 2 Aug 2013 00:55:49 +0000 (17:55 -0700)]
Hide "View Photo Sphere" button by default.
Change-Id: Idb31a96d0dcb19e6d57c1c5d388ef8d180382345
John Hoford [Fri, 2 Aug 2013 00:49:20 +0000 (00:49 +0000)]
Merge "add Per Channel Saturation" into gb-ub-photos-carlsbad
Angus Kong [Tue, 30 Jul 2013 18:36:00 +0000 (11:36 -0700)]
Add LocalDataAdapter and wrappers.
1. FixedFirstDataAdapter wraps another adapter and add a data at the first
position.
2. FixedLastDataAdapter wraps another adapter and add a data at the last
position.
3. Make the LocalData interface more complete.
- onFullScreen()
- canSwipeInFullScreen()
- getPath()
3. Add methods to the FilmStripView.DataAdapter to receive UI events.
- onDataCentered()
- onDataFullScreen()
Change-Id: I26d3a3b7facd0c451af43ce5fbbcab2baaaec427
John Hoford [Tue, 30 Jul 2013 21:40:18 +0000 (14:40 -0700)]
add Per Channel Saturation
Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
Sascha Haeberling [Thu, 1 Aug 2013 22:50:52 +0000 (22:50 +0000)]
Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 31 Jul 2013 18:28:21 +0000 (11:28 -0700)]
Adds back the PhotoSphere View icon in filmstrip.
This also exercises the "leave a place cleaner than you found it" rule
by cleaning up stuff:
- Formatting according to the Android format rules
- Removing unused code
- Putting braces where they belong.
Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
Ruben Brunk [Thu, 18 Jul 2013 23:37:30 +0000 (16:37 -0700)]
Refactoring Geometry handling.
Bug:
9170644
Bug:
9366654
Bug:
9366263
- Consolidates all the geometry transforms in GeometryMathUtils and
significantly reduces complexity.
- Removes GeometryMetadata object and dependent code.
- Removes ImageGeometry and geometry update callbacks.
Change-Id: I59add51907459593244c9ebaadef585efc7486d5
nicolasroard [Wed, 31 Jul 2013 23:22:59 +0000 (16:22 -0700)]
Fix problem with N-1 caching when no filters / one filter
- also fix equals() for geometry
Change-Id: I6f6f21d1e274b3b95ac4b5189b2fa7f419912864
Angus Kong [Wed, 31 Jul 2013 22:21:21 +0000 (22:21 +0000)]
Merge "Add wrapper for face detection listener." into gb-ub-photos-carlsbad
nicolasroard [Wed, 31 Jul 2013 22:19:22 +0000 (22:19 +0000)]
Merge "Implements N-1 Caching" into gb-ub-photos-carlsbad
nicolasroard [Wed, 31 Jul 2013 03:01:21 +0000 (20:01 -0700)]
Implements N-1 Caching
Change-Id: Ief1a04dbe4f6ced15f937177a556733cfcdb5879
Angus Kong [Wed, 31 Jul 2013 21:05:20 +0000 (14:05 -0700)]
Add wrapper for face detection listener.
bug:
10113532
Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
Doris Liu [Wed, 31 Jul 2013 18:25:09 +0000 (11:25 -0700)]
Set default video quality to the highest
Bug:
9886141
Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
Angus Kong [Wed, 31 Jul 2013 19:46:54 +0000 (12:46 -0700)]
Fix switching camera failure.
bug:
10110830
Change-Id: I1adcefc229ce4a245880bc037a086c949c73da55
Ruben Brunk [Wed, 31 Jul 2013 18:28:43 +0000 (18:28 +0000)]
Merge "Do antialiasing on wallpaper preview." into gb-ub-photos-carlsbad
Ruben Brunk [Wed, 31 Jul 2013 06:06:19 +0000 (23:06 -0700)]
Do antialiasing on wallpaper preview.
Bug:
9052851
Change-Id: I890fae2d4bb9907c7204cc6fa34c42c7fe7c7309
John Hoford [Tue, 30 Jul 2013 23:26:20 +0000 (23:26 +0000)]
Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbad
John Hoford [Tue, 30 Jul 2013 23:02:10 +0000 (16:02 -0700)]
clean up some bugs and update the icons
Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
nicolasroard [Mon, 15 Jul 2013 18:24:36 +0000 (11:24 -0700)]
Add user presets saving/loading
Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
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
ztenghui [Mon, 22 Jul 2013 21:06:22 +0000 (14:06 -0700)]
WAR the crash from re-editing missing online image
Instead of crashing, we get a toast now.
As a bonus, this will show the same toast if .aux directory is removed
manually.
bug:
9961671
Change-Id: I92f38fc752a48d3cb5a9a80aa041cd9b290937ea
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
OSDN Git Service
