OSDN Git Service
Ruben Brunk [Thu, 25 Oct 2012 02:37:52 +0000 (19:37 -0700)]
Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 02:09:09 +0000 (19:09 -0700)]
Fixed blackscreen when launching crop from menu.
Bug:
7410287
Change-Id: I60ae95cff82c789df37ce1b45fbaaaffa1aa552b
nicolasroard [Thu, 25 Oct 2012 00:47:12 +0000 (17:47 -0700)]
Add rotation to tinyplanet view
bug:
7389189
Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d
nicolasroard [Wed, 24 Oct 2012 23:39:41 +0000 (16:39 -0700)]
Fixes UI stuff
bug:
7393871
bug:
7387596
Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f
Teng-Hui Zhu [Wed, 24 Oct 2012 23:33:47 +0000 (16:33 -0700)]
Merge "Initialize the modified date correctly." into gb-ub-photos-arches
nicolasroard [Wed, 24 Oct 2012 22:43:56 +0000 (15:43 -0700)]
Change background and panel colors
bug:
7385980
Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4
Teng-Hui Zhu [Wed, 24 Oct 2012 22:08:59 +0000 (15:08 -0700)]
Initialize the modified date correctly.
On top of that, the date_taken is in units of seconds, while others are in
units of milliseconds.
bug:
7307090
Change-Id: I3f14a6354fa72a20d228d49a92d5c2007ca29df1
Bobby Georgescu [Wed, 24 Oct 2012 21:25:38 +0000 (14:25 -0700)]
Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
Bobby Georgescu [Wed, 24 Oct 2012 21:15:38 +0000 (14:15 -0700)]
Fix attempted uploading of recycled tiles
Bug:
7405398
Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548
John Reck [Wed, 24 Oct 2012 19:56:31 +0000 (12:56 -0700)]
Move loadBitmap to async task
Bug:
7406705
Change-Id: I4e540e08d239d2e57f0ae6be5d70c8777cdbab2a
Bobby Georgescu [Wed, 24 Oct 2012 19:09:38 +0000 (12:09 -0700)]
Launch built-in camera app via filmstrip
Bug:
7407182
Change-Id: I25e0028dd5f3889f7837494e0bf25c54edbb4405
Ruben Brunk [Wed, 24 Oct 2012 18:05:45 +0000 (11:05 -0700)]
Took out aspect ratio switching.
Bug:
7406414
Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9
nicolasroard [Wed, 24 Oct 2012 18:38:24 +0000 (11:38 -0700)]
Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
nicolasroard [Wed, 24 Oct 2012 18:31:57 +0000 (11:31 -0700)]
Save the image when applying tiny planet
bug:
7403622
Change-Id: Ic199b163d6418b6d45c2da10b915f2088dd52e16
John Hoford [Wed, 24 Oct 2012 18:15:49 +0000 (11:15 -0700)]
Merge "limited the size of textures to 2048" into gb-ub-photos-arches
John Hoford [Wed, 24 Oct 2012 18:08:01 +0000 (11:08 -0700)]
limited the size of textures to 2048
bug:
7404007
Change-Id: I77fac900e213ca16c2accfa8f59d0cd300559836
Bobby Georgescu [Wed, 24 Oct 2012 03:52:26 +0000 (20:52 -0700)]
Do not show bottom controls when undo bar is visible
Bug:
7403458
Change-Id: I1e789ebd7f08256a1ccbdb2ac9f2f9f97d0859c6
Bobby Georgescu [Wed, 24 Oct 2012 16:15:52 +0000 (09:15 -0700)]
Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
Owen Lin [Tue, 23 Oct 2012 04:41:23 +0000 (12:41 +0800)]
Use TiledTexture for thumbnails.
1. Use TiledTexture for thumbnails to prevent jank in uploading big
thumbnails. (e.g., 512 * 512)
2. Use larger thumbnails (DISPLAY_LONG_SIDE / 5).
bug:
7381302
Change-Id: I7661d648373e893b40b2a0304037171760091e00
Sascha Haeberling [Wed, 24 Oct 2012 05:34:21 +0000 (22:34 -0700)]
Use XMP meta-data for correct tiny planets.
Bug:
7403766
Change-Id: Ie03d40d0396d352d6fe48c91b995a2f872c98a06
Ruben Brunk [Wed, 24 Oct 2012 01:11:10 +0000 (18:11 -0700)]
Fixed scaling factor for ImageShow and rotations.
Bug:
7392240
Bug:
7386048
Change-Id: I156c52acbd041604df2f7ccacca3a80f1b9fdb3b
Bobby Georgescu [Wed, 24 Oct 2012 03:29:57 +0000 (20:29 -0700)]
Do not show Camera placeholder when not appropriate
Bug:
7403454
Change-Id: I5cc0227f068da0ca596e6259314b9d2ade62de07
Ruben Brunk [Wed, 24 Oct 2012 02:42:12 +0000 (19:42 -0700)]
Merge "Fix so mirror gets applied." into gb-ub-photos-arches
Nicolas Roard [Wed, 24 Oct 2012 02:40:46 +0000 (19:40 -0700)]
Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
Ruben Brunk [Wed, 24 Oct 2012 02:30:00 +0000 (19:30 -0700)]
Fix so mirror gets applied.
Bug:
7402773
Change-Id: I531b795c2f43379e9eaf1ad3b9292e62c867ec3c
Doris Liu [Wed, 24 Oct 2012 01:53:05 +0000 (18:53 -0700)]
Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
John Hoford [Wed, 24 Oct 2012 00:14:35 +0000 (17:14 -0700)]
Support XMP data, fixed read file on another thread
bug:
7293391
Change-Id: I634857dea3c4d0d204c3fb40f0eec9dc1a9af263
Ruben Brunk [Tue, 23 Oct 2012 21:48:58 +0000 (14:48 -0700)]
Increased touch tolerance in cropping.
Bug:
7342281
Change-Id: Ice2ba5f07074b1518e4064bbda489aae7ba17b22
Doris Liu [Tue, 23 Oct 2012 23:12:27 +0000 (16:12 -0700)]
Stay in AlbumPage when dismissing a popup from AP
Bug:
7384972
Change-Id: Ie2434ecc203a98610f1954b73a3d6916940eb812
Ruben Brunk [Mon, 22 Oct 2012 10:50:38 +0000 (03:50 -0700)]
Reworked crop/transform UI.
Bug:
7385644
Bug:
7378335
Bug:
7366075
Change-Id: Iee7e0a0741b69269b08726bad45e29d86834054e
John Hoford [Tue, 23 Oct 2012 22:17:12 +0000 (15:17 -0700)]
add support for black and white filters, add rotation API to tiny planet
bug:
7386370
bug:
7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
Bobby Georgescu [Tue, 23 Oct 2012 22:40:06 +0000 (15:40 -0700)]
Fix jank when launching editor from Camera filmstrip
Bug:
7301182
Status bar visibility in FilterShow will now match
the one in Camera/Gallery so that there isn't weird
jank when launching.
Change-Id: I3e942633b351264d2cd38cc5b587de32e38521ed
nicolasroard [Tue, 23 Oct 2012 22:09:53 +0000 (15:09 -0700)]
Merge "Express the borders size in percentages" into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 22:08:35 +0000 (15:08 -0700)]
Merge "Fix NPE" into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 22:03:14 +0000 (15:03 -0700)]
Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 20:44:58 +0000 (13:44 -0700)]
Fix NPE
Bug:
7399438
Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Express the borders size in percentages
bug:
7379459
Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb
George Mount [Tue, 23 Oct 2012 21:28:58 +0000 (14:28 -0700)]
Fix NPE in detecting panoramas.
Bug
7398022
Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Hide the history panel on rotation
bug:
7386882
Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93
nicolasroard [Tue, 23 Oct 2012 19:59:16 +0000 (12:59 -0700)]
Fix another potential crash in Curves
bug:
7379140
Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080
nicolasroard [Tue, 23 Oct 2012 19:45:50 +0000 (12:45 -0700)]
Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 19:18:54 +0000 (12:18 -0700)]
Fix flickering in geometry panel
bug:
7344214
Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
Bobby Georgescu [Tue, 23 Oct 2012 18:51:06 +0000 (11:51 -0700)]
Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 18:20:48 +0000 (11:20 -0700)]
Show Panorama viewer button in filmstrip mode
Bug:
7393346
Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c
nicolasroard [Tue, 23 Oct 2012 18:26:38 +0000 (11:26 -0700)]
Add copyright notices
bug:
7387634
Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1
nicolasroard [Tue, 23 Oct 2012 17:51:42 +0000 (10:51 -0700)]
Fix slow / jerky tracking in Curves
bug:
7394837
Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91
nicolasroard [Tue, 23 Oct 2012 17:34:10 +0000 (10:34 -0700)]
Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 17:26:49 +0000 (10:26 -0700)]
Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
nicolasroard [Sat, 20 Oct 2012 19:32:05 +0000 (12:32 -0700)]
Shows filtered images in geometry modules and comparison.
bug:
7279469
bug:
7379286
bug:
7344214
bug:
7379140
Also:
- cache multiple version (with/without geometry or filters applied)
- doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now)
- fix potential crash in Curves
Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8
George Mount [Tue, 23 Oct 2012 16:33:20 +0000 (09:33 -0700)]
Ensure photo sphere icon shows for panoramas.
Bug
7393844
Change-Id: Id3b0d15606ec6e5d41558cbfc5089c4b1b229c63
John Hoford [Mon, 22 Oct 2012 23:26:26 +0000 (16:26 -0700)]
on entry check if Tiny Planet if not remove UI
bug:
7391885
Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
Bobby Georgescu [Tue, 23 Oct 2012 01:00:44 +0000 (18:00 -0700)]
Merge "Minor transition tweaks" into gb-ub-photos-arches
Doris Liu [Tue, 23 Oct 2012 00:55:57 +0000 (17:55 -0700)]
Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 22:28:04 +0000 (15:28 -0700)]
Minor transition tweaks
Bug:
7376109
Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c
Doris Liu [Sat, 20 Oct 2012 02:16:14 +0000 (19:16 -0700)]
Show panorama thumbs in Gallery grid view
Bug:
7362229
Bug:
7378208
In addition to showing pano thumbs, this CL also removes the video play
icon on the top-level album view thumbnails.
Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b
Hung-ying Tyan [Mon, 22 Oct 2012 23:22:21 +0000 (16:22 -0700)]
Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
John Reck [Mon, 22 Oct 2012 23:19:52 +0000 (16:19 -0700)]
Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
John Reck [Mon, 22 Oct 2012 23:11:01 +0000 (16:11 -0700)]
Drive GLRootView with Choreographer
Bug:
7332724
By routing requestRender through postOnAnimation we can drive
the GLRootView's rendering with the UI thread's coreographer, which
ensures that touch events are processed before drawing
Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c
Bobby Georgescu [Mon, 22 Oct 2012 22:53:30 +0000 (15:53 -0700)]
Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
Ruben Brunk [Mon, 22 Oct 2012 22:20:55 +0000 (15:20 -0700)]
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 20:49:35 +0000 (13:49 -0700)]
Scroll to placeholder in gallery filmstrip launches camera
Bug:
7368079
Change-Id: I50323b6b4d64672486cdca785b9f1e1ae2f02a97
George Mount [Mon, 22 Oct 2012 21:35:50 +0000 (14:35 -0700)]
Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
Ruben Brunk [Fri, 19 Oct 2012 06:39:18 +0000 (23:39 -0700)]
Fix geometry xforms & minor bug.
Bug:
7376048
Fixed geometry transform. Fixed minor bug where the foldername
for saved edited images was incorrect.
Change-Id: I901df11cf71cd987b354dd7821fef7a484b0cbd3
George Mount [Mon, 22 Oct 2012 18:39:25 +0000 (11:39 -0700)]
Add null-check for StitchingServiceProvider.
Bug
7386827
Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03
Bobby Georgescu [Mon, 22 Oct 2012 18:25:46 +0000 (11:25 -0700)]
Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
Ruben Brunk [Sat, 20 Oct 2012 01:48:22 +0000 (18:48 -0700)]
Fix to ensure visible history adapter strings are from xml.
Bug:
7379327
Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
Bobby Georgescu [Mon, 22 Oct 2012 18:13:34 +0000 (11:13 -0700)]
Better transition between Gallery and editor
Bug:
7346155
Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf
nicolasroard [Mon, 22 Oct 2012 16:47:34 +0000 (09:47 -0700)]
Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 03:27:21 +0000 (20:27 -0700)]
Merge "Tweak transition animations" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 03:17:08 +0000 (20:17 -0700)]
Tweak transition animations
Bug:
7376109
Change-Id: I28cc8413bda31ff945e8e48dd75b86b2e9d071a8
Hung-ying Tyan [Fri, 19 Oct 2012 12:50:50 +0000 (20:50 +0800)]
Move new exif lib to gallerycommon.
https://googleplex-android-review.googlesource.com/#/c/242047 depends on this.
Bug:
6667860
Change-Id: Iac937e2eea94f0f5ffde876235b1c2ee748e7570
nicolasroard [Mon, 22 Oct 2012 01:42:07 +0000 (18:42 -0700)]
Fix the undo/redo/reset menu item state
bug:
7357734
- enable/disable the undo/redo/reset menu item
depending on the history.
Change-Id: I633008bc9a99eef2e7289b290fc96120f09b3825
nicolasroard [Sun, 21 Oct 2012 23:51:08 +0000 (16:51 -0700)]
Prevent unveil direction to change as long as no touch up
bug:
7385925
Change-Id: I16f17e6de1624f7a40b16641122103edc0f5bb64
nicolasroard [Sun, 21 Oct 2012 22:58:50 +0000 (15:58 -0700)]
Fix crash in Curves module
bug:
7379140
Change-Id: I26f30d24eb8cf2db9248f29549d8b435d941a325
nicolasroard [Sun, 21 Oct 2012 22:39:44 +0000 (15:39 -0700)]
Fix several issues with crop/straighten
bug:
7386266
bug:
7386270
bug:
7385727
- use a transparent white for the bounds instead of green
- add "rule of third" lines to the crop tool
- improves preview image quality for geometric operations
Change-Id: I94c233e7ea89d67451e7808fb71537d03a1c183d
nicolasroard [Sun, 21 Oct 2012 21:53:03 +0000 (14:53 -0700)]
Only translate the main panel if we have to.
bug:
7386882
Change-Id: Ib670eb4e513f0bbebd3ecca052fe27180dcf5fdc
nicolasroard [Sun, 21 Oct 2012 19:58:59 +0000 (12:58 -0700)]
Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
bug:
7384984
Change-Id: Id10c7ac08cc7aab4d2f4b19c88b20d0f3369807a
Doris Liu [Sat, 20 Oct 2012 01:18:39 +0000 (18:18 -0700)]
Fix for active action bar in camera
Bug:
7377404
Bug:
7384972
Change-Id: Ic54a7501ed3e2a61fab272461dee474b693c8f3a
Sascha Haeberling [Fri, 19 Oct 2012 22:43:03 +0000 (15:43 -0700)]
Adds a tiny planet (stereographic projection) image filter.
Bug:
7293391
Also fixes an issue where the preview value was statically set to 100.
This adds a preview parameter value that can be set for this purpose.
Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e
John Hoford [Fri, 19 Oct 2012 22:32:12 +0000 (15:32 -0700)]
Add the infrastructure to support Tiny Planet
bug:
7293391
Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
Bobby Georgescu [Fri, 19 Oct 2012 22:43:38 +0000 (15:43 -0700)]
Fix delete and undo behavior on filmstrip
Bug:
7353749
Change-Id: Ib0abd3f71783c01b1df418dd76e674bf05e65ce7
nicolasroard [Fri, 19 Oct 2012 23:05:54 +0000 (16:05 -0700)]
Merge "Improves swipe gesture" into gb-ub-photos-arches
nicolasroard [Fri, 19 Oct 2012 21:10:46 +0000 (14:10 -0700)]
Improves swipe gesture
bug:
7379463
- better timings
- add original label
- remove the gesture detector from ImageZoom (use the parent's one)
Change-Id: Ib6879e471dfc21cb3a112aa36a61cd304516cf7f
George Mount [Fri, 19 Oct 2012 21:57:51 +0000 (14:57 -0700)]
Remove progress bar when switching to grid mode.
Bug
7377975
Change-Id: I388fdf6c6c9a5ffa64e10f864806a8131e53a009
Mangesh Ghiware [Fri, 19 Oct 2012 20:28:07 +0000 (13:28 -0700)]
Re-enable crop for new panorama
Bug:
7326215
Change-Id: Ic7a87baceb8aff6247d40b91d4c60cd47c86c377
Ruben Brunk [Fri, 19 Oct 2012 20:07:07 +0000 (13:07 -0700)]
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
Bobby Georgescu [Fri, 19 Oct 2012 19:53:36 +0000 (12:53 -0700)]
Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
Bobby Georgescu [Fri, 19 Oct 2012 19:40:40 +0000 (12:40 -0700)]
Saner behavior when deleting in filmstrip mode
Bug:
7353749
Change-Id: Ic9854d205fe5ab76dd1cfe78fee314e93e1ace55
Mangesh Ghiware [Fri, 19 Oct 2012 18:28:30 +0000 (11:28 -0700)]
Fix sharing state in Gallery ActionBar
Bug:
7340067
Change-Id: I4ff9577315fc743f6b9fef0d325b0743546f108e
Ruben Brunk [Fri, 19 Oct 2012 06:39:18 +0000 (23:39 -0700)]
Fix geometry xforms & minor bug.
Bug:
7376048
Fixed geometry transform. Fixed minor bug where the foldername
for saved edited images was incorrect.
Change-Id: Icb3156f02b7db7b50a455aaa31ee70832e3fdca8
nicolasroard [Fri, 19 Oct 2012 00:53:44 +0000 (17:53 -0700)]
Improves Curves & Crop UI
bug:
7361722
- Use new assets
- Add a margin
- Add a popup menu
- Add a new button showing the current channel
- Add popup menu, new assets, new button for Crop as well
Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
Doris Liu [Fri, 19 Oct 2012 04:52:49 +0000 (21:52 -0700)]
Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
Bobby Georgescu [Fri, 19 Oct 2012 03:50:19 +0000 (20:50 -0700)]
Merge "Fix Gallery crash" into gb-ub-photos-arches
Doris Liu [Thu, 18 Oct 2012 22:01:35 +0000 (15:01 -0700)]
Adding support for tiny planet in gallery
Bug:
7344427
Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
Bobby Georgescu [Fri, 19 Oct 2012 00:56:20 +0000 (17:56 -0700)]
Fix Gallery crash
Bug:
7268985
Change-Id: I88c823d3270cb74d6e2bd7df5b6b6ed9e28f16a6
Scott Main [Thu, 18 Oct 2012 18:59:47 +0000 (11:59 -0700)]
DO NOT MERGE
cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
remove old fashioned Dream, no longer supported
Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
Conflicts:
AndroidManifest.xml
Bobby Georgescu [Fri, 19 Oct 2012 00:34:27 +0000 (17:34 -0700)]
Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
John Reck [Thu, 18 Oct 2012 01:47:39 +0000 (18:47 -0700)]
Save XMP & Exif data on edited photos
Bug:
7293391
Bug:
7329199
Bug:
7376660
Change-Id: I23b1637a9a494c1dc43b1fc1359cdaf3e75bc23f
nicolasroard [Thu, 18 Oct 2012 00:46:47 +0000 (17:46 -0700)]
Fix undo/redo/back button behaviour with effects and enable history
bug:
7332980
bug:
7357734
bug:
7325872
Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c
Bobby Georgescu [Thu, 18 Oct 2012 22:36:03 +0000 (15:36 -0700)]
Do not show "Filmstrip view" text when photo is fullscreen
Bug: 243374
Change-Id: I2d0a1d56e6c2d833d9d75041b30afcb988635c49