OSDN Git Service
John Hoford [Tue, 23 Oct 2012 02:58:11 +0000 (19:58 -0700)]
am
5fbfe6f1: on entry check if Tiny Planet if not remove UI
* commit '
5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79':
on entry check if Tiny Planet if not remove UI
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
Mangesh Ghiware [Tue, 23 Oct 2012 01:44:26 +0000 (18:44 -0700)]
am
63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches
* commit '
6377075221ef5b31c7f87e7f0103124e5177c2c3':
Add activity-alias for video camera
Mangesh Ghiware [Tue, 23 Oct 2012 01:43:03 +0000 (18:43 -0700)]
Merge "Add activity-alias for video camera" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 01:03:02 +0000 (18:03 -0700)]
am
afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
* commit '
afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c':
Minor transition tweaks
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:57:48 +0000 (17:57 -0700)]
am
3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
* commit '
3a64ad361b9d48407abd902b26949d3c6b34af66':
Show panorama thumbs in Gallery grid view
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:23:47 +0000 (16:23 -0700)]
am
bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
* commit '
bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468':
Move new exif lib to gallerycommon.
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:21:38 +0000 (16:21 -0700)]
am
ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
* commit '
ff4e0460b4cdeb329e37cb5f41eedc45717a17c4':
Drive GLRootView with Choreographer
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:56:08 +0000 (15:56 -0700)]
am
e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
* commit '
e96e907a01c0d633828dade014f07a5b93b07356':
Scroll to placeholder in gallery filmstrip launches camera
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
Mangesh Ghiware [Mon, 22 Oct 2012 22:47:22 +0000 (15:47 -0700)]
Add activity-alias for video camera
Bug:
7390076
Change-Id: I4827f1b5412476075f89d714fe3f1bbe2576c357
Ruben Brunk [Mon, 22 Oct 2012 22:22:45 +0000 (15:22 -0700)]
am
168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
168db2f10069c3a15a9c3b9d0325cac0ae779b99':
Fix geometry xforms & minor bug.
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
Bobby Georgescu [Mon, 22 Oct 2012 21:50:22 +0000 (14:50 -0700)]
am
3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
* commit '
3536bd340f43edfc9f318df5f49e9319e62d0cc4':
Increase album label size on high-res screens
Bobby Georgescu [Mon, 22 Oct 2012 21:48:42 +0000 (14:48 -0700)]
Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
George Mount [Mon, 22 Oct 2012 21:37:09 +0000 (14:37 -0700)]
am
58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
* commit '
58d326ea368ae275f03ec158a9ec5f9d2965593a':
Add null-check for StitchingServiceProvider.
George Mount [Mon, 22 Oct 2012 21:35:50 +0000 (14:35 -0700)]
Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
Baligh Uddin [Mon, 22 Oct 2012 21:29:55 +0000 (14:29 -0700)]
am
73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
73c89b45b122cbdcbcffa618f0fa2386829d710a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 21:27:35 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Mon, 22 Oct 2012 21:27:14 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Bobby Georgescu [Mon, 22 Oct 2012 21:18:32 +0000 (14:18 -0700)]
Increase album label size on high-res screens
Bug:
7382498
Change-Id: I50f5f7c6006fed493918c05f2eb7d2cf3ade3947
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:26:39 +0000 (11:26 -0700)]
am
1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
* commit '
1dace572562075e755823bbb7b02d09bb6ca1259':
Better transition between Gallery and editor
Ruben Brunk [Mon, 22 Oct 2012 18:26:37 +0000 (11:26 -0700)]
am
0a32b7af: Fix to ensure visible history adapter strings are from xml.
* commit '
0a32b7afc5286a5c7aa334b9338591d61a49731f':
Fix to ensure visible history adapter strings are from xml.
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:49:59 +0000 (09:49 -0700)]
am
51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
* commit '
51e5b7198dbf31bdfaefc7d01517050359571eb8':
Fix the undo/redo/reset menu item state
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
Baligh Uddin [Mon, 22 Oct 2012 15:15:59 +0000 (08:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59932bfe8d8a0082a077c9d7100fcaa861d02d15
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Oct 2012 15:14:33 +0000 (08:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0ff70b2e7123f5013834cc5ba819fad8e190e4e0
Auto-generated-cl: translation import
Bobby Georgescu [Mon, 22 Oct 2012 03:29:44 +0000 (20:29 -0700)]
am
e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
* commit '
e42eca39c726bce2452ee9d9a1c4d4cb042031ba':
Tweak transition animations
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 [Mon, 22 Oct 2012 00:17:03 +0000 (17:17 -0700)]
am
c778aab1: Prevent unveil direction to change as long as no touch up
* commit '
c778aab129fb001fdff1ccf167867fc40fbf7523':
Prevent unveil direction to change as long as no touch up
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 23:37:50 +0000 (16:37 -0700)]
am
15a056e3: Fix crash in Curves module
* commit '
15a056e3cc1970bc0b99dba71df8222ba0345859':
Fix crash in Curves module
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:54:29 +0000 (15:54 -0700)]
am
104165f1: Fix several issues with crop/straighten
* commit '
104165f1f9858bdebb2d219b077f5227203f7c02':
Fix several issues with crop/straighten
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 22:20:13 +0000 (15:20 -0700)]
am
4d276f33: Only translate the main panel if we have to.
* commit '
4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c':
Only translate the main panel if we have to.
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 20:28:38 +0000 (13:28 -0700)]
am
267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
* commit '
267c4c6a513671441031a9c21839995aecc4fc52':
Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
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 17:56:29 +0000 (10:56 -0700)]
am
2daced6b: Fix for active action bar in camera
* commit '
2daced6baacd59850e7c64ea02f2479530654ed8':
Fix for active action bar in camera
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 [Sat, 20 Oct 2012 00:27:44 +0000 (17:27 -0700)]
am
2f879102: Adds a tiny planet (stereographic projection) image filter.
* commit '
2f879102d630815df64636b8d37e3a7eea8e8b65':
Adds a tiny planet (stereographic projection) image filter.
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 23:26:14 +0000 (16:26 -0700)]
am
e9c55b28: Add the infrastructure to support Tiny Planet
* commit '
e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4':
Add the infrastructure to support Tiny Planet
Bobby Georgescu [Fri, 19 Oct 2012 23:21:05 +0000 (16:21 -0700)]
am
41b3cff6: Fix delete and undo behavior on filmstrip
* commit '
41b3cff60905a96ab5b6f8e5f42bcc3bab1eb605':
Fix delete and undo behavior on filmstrip
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:07:52 +0000 (16:07 -0700)]
am
3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches
* commit '
3926a685eb08ee2bb5e6cf9dc03d070462f19f64':
Improves swipe gesture
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 22:42:34 +0000 (15:42 -0700)]
am
4dd4d80a: Remove progress bar when switching to grid mode.
* commit '
4dd4d80af4cd3ba7555c12d1c1ba775e048b6c57':
Remove progress bar when switching to grid mode.
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
Bobby Georgescu [Fri, 19 Oct 2012 21:20:25 +0000 (14:20 -0700)]
am
4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches
* commit '
4883dafd9fc7e242f3cc3dd4155a7b90ee3975a8':
Change number of album rows on large screens
Bobby Georgescu [Fri, 19 Oct 2012 21:18:52 +0000 (14:18 -0700)]
Merge "Change number of album rows on large screens" into gb-ub-photos-arches
Mangesh Ghiware [Fri, 19 Oct 2012 20:42:53 +0000 (13:42 -0700)]
am
ea78390e: Re-enable crop for new panorama
* commit '
ea78390e87642b4bc3860ba6cbdfa655db3c9e46':
Re-enable crop for new panorama
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:09:20 +0000 (13:09 -0700)]
am
b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
b48d73db3381718bcf86d1d919f6de9125f4f8a2':
Fix geometry xforms & minor bug.
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 18:38:35 +0000 (11:38 -0700)]
Change number of album rows on large screens
Bug:
7382498
Change-Id: Iec5b0a8491a5b4a6968da9008eab90ddd5d5bcf9
Bobby Georgescu [Fri, 19 Oct 2012 19:56:10 +0000 (12:56 -0700)]
am
08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
* commit '
084413718180f286edc94320c593bbb75dbec40b':
Saner behavior when deleting in filmstrip mode
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
Mangesh Ghiware [Fri, 19 Oct 2012 19:51:57 +0000 (12:51 -0700)]
am
b037754e: Fix sharing state in Gallery ActionBar
* commit '
b037754eac0a4f99747edd3135776dc471d566f8':
Fix sharing state in Gallery ActionBar
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 06:44:54 +0000 (23:44 -0700)]
am
c5590eb1: Improves Curves & Crop UI
* commit '
c5590eb1a20b112e67e4c43684790587f844fc6b':
Improves Curves & Crop UI
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:54:54 +0000 (21:54 -0700)]
am
4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
* commit '
4b6c20de6fef0aacb464398f2a6bf4b7959f4726':
Adding support for tiny planet in gallery
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:52:08 +0000 (20:52 -0700)]
am
b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
* commit '
b42ea0266c3b10e0b40119ec5c0adf6e9bb8973b':
Fix Gallery crash
Bobby Georgescu [Fri, 19 Oct 2012 03:50:19 +0000 (20:50 -0700)]
Merge "Fix Gallery crash" into gb-ub-photos-arches
Scott Main [Fri, 19 Oct 2012 01:49:22 +0000 (18:49 -0700)]
am
9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '
9baf2fd55613ce3f545da2d341c8e8a36b82ee78':
DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
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:36:21 +0000 (17:36 -0700)]
am
79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
* commit '
79704855fb9b83acf9dc505f9ab1989ec1c770bc':
Do not show "Filmstrip view" text when photo is fullscreen
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 [Fri, 19 Oct 2012 00:30:12 +0000 (17:30 -0700)]
am
014a111f: Save XMP & Exif data on edited photos
* commit '
014a111f10a7523415ca210bc6fe1e4f00183d31':
Save XMP & Exif data on edited photos
nicolasroard [Fri, 19 Oct 2012 00:11:58 +0000 (17:11 -0700)]
am
d7899c56: Fix undo/redo/back button behaviour with effects and enable history
* commit '
d7899c56b8df278dfd6720ae11eadc2f89fe8094':
Fix undo/redo/back button behaviour with effects and enable history
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
George Mount [Thu, 18 Oct 2012 23:56:30 +0000 (16:56 -0700)]
am
0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
* commit '
0745eba4898419aad2b6e79be137a2a1edf4d0fc':
Remove panorama checks from supported operations.
nicolasroard [Thu, 18 Oct 2012 23:55:19 +0000 (16:55 -0700)]
am
60d25279: Handle screen rotation
* commit '
60d252795f41d0cfe4d0e11b4d1e32d4547368c9':
Handle screen rotation
OSDN Git Service
