OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 01:05:22 +0000 (18:05 -0700)]
am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches

* commit '0df51da9b67e1c66f0a85a475ce567c11b8d4aa1':
  Minor transition tweaks

11 years agoam afa5ac4c: Merge "Minor transition tweaks" 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

11 years agoMerge "Minor transition tweaks" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 01:00:44 +0000 (18:00 -0700)]
Merge "Minor transition tweaks" into gb-ub-photos-arches

11 years agoam 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into...
Doris Liu [Tue, 23 Oct 2012 01:00:38 +0000 (18:00 -0700)]
am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit '7ad3eb28f0ab85669841c1b5589982834b465c1b':
  Show panorama thumbs in Gallery grid view

11 years agoam 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos...
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

11 years agoMerge "Show panorama thumbs in Gallery grid view" 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

11 years agoMinor transition tweaks
Bobby Georgescu [Mon, 22 Oct 2012 22:28:04 +0000 (15:28 -0700)]
Minor transition tweaks

Bug: 7376109
Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c

11 years agoShow panorama thumbs in Gallery grid view
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

11 years agoam 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub...
Hung-ying Tyan [Mon, 22 Oct 2012 23:25:36 +0000 (16:25 -0700)]
am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

* commit '23cfddb44a19683b1f5a61200875048d7b916dd4':
  Move new exif lib to gallerycommon.

11 years agoam bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
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.

11 years agoam fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub...
John Reck [Mon, 22 Oct 2012 23:23:10 +0000 (16:23 -0700)]
am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

* commit 'fdfced2d4eb28e510926aa704921cfe2d6e170b5':
  Drive GLRootView with Choreographer

11 years agoMerge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
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

11 years agoam ff4e0460: Merge "Drive GLRootView with Choreographer" 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

11 years agoMerge "Drive GLRootView with Choreographer" 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

11 years agoDrive GLRootView with Choreographer
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

11 years agoam b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches...
Bobby Georgescu [Mon, 22 Oct 2012 22:59:10 +0000 (15:59 -0700)]
am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

* commit 'b21c127cf83ccc1bd86deb3fb35fea974e69957c':
  Scroll to placeholder in gallery filmstrip launches camera

11 years agoam e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into...
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

11 years agoMerge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos...
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

11 years agoam 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos...
Ruben Brunk [Mon, 22 Oct 2012 22:25:37 +0000 (15:25 -0700)]
am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit '91814c2e343b9a0b602e38816047bfd7cb58007c':
  Fix geometry xforms & minor bug.

11 years agoam 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
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.

11 years agoMerge "Fix geometry xforms & minor bug." 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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 22 Oct 2012 22:11:03 +0000 (15:11 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

11 years agoScroll to placeholder in gallery filmstrip launches camera
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

11 years agoam cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into...
Bobby Georgescu [Mon, 22 Oct 2012 21:52:33 +0000 (14:52 -0700)]
am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

* commit 'cfbbe15d8b927d3be388340c62cee5e5b3af850f':
  Increase album label size on high-res screens

11 years agoam 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos...
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

11 years agoMerge "Increase album label size on high-res screens" into gb-ub-photos-arches
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

11 years agoam f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into...
George Mount [Mon, 22 Oct 2012 21:39:41 +0000 (14:39 -0700)]
am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

* commit 'f2272574dcefc4e1f369fbf0de55559d1548c741':
  Add null-check for StitchingServiceProvider.

11 years agoam 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos...
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.

11 years agoMerge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
George Mount [Mon, 22 Oct 2012 21:35:50 +0000 (14:35 -0700)]
Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

11 years agoam 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 22 Oct 2012 21:32:05 +0000 (14:32 -0700)]
am 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '1d25a68700185f2126dc387a28c0d966853e8776':
  Import translations. DO NOT MERGE

11 years agoam 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
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

11 years agoam 2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 21:29:36 +0000 (14:29 -0700)]
am 2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2ed15703c06d1b4691737475f127eecbffa056e9':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Mon, 22 Oct 2012 21:27:35 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 21:27:14 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoIncrease album label size on high-res screens
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

11 years agoFix geometry xforms & minor bug.
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

11 years agoAdd null-check for StitchingServiceProvider.
George Mount [Mon, 22 Oct 2012 18:39:25 +0000 (11:39 -0700)]
Add null-check for StitchingServiceProvider.

 Bug 7386827

Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03

11 years agoam 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into...
Bobby Georgescu [Mon, 22 Oct 2012 18:29:04 +0000 (11:29 -0700)]
am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

* commit '3434759816cea392a78df62a1ad3d0151163510a':
  Better transition between Gallery and editor

11 years agoam 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from...
Ruben Brunk [Mon, 22 Oct 2012 18:29:03 +0000 (11:29 -0700)]
am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml.

* commit '85930f99d020b9b8bac7bd29cf77434c034d152a':
  Fix to ensure visible history adapter strings are from xml.

11 years agoam 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos...
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

11 years agoam 0a32b7af: Fix to ensure visible history adapter strings are from xml.
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.

11 years agoMerge "Better transition between Gallery and editor" into gb-ub-photos-arches
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

11 years agoFix to ensure visible history adapter strings are from xml.
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

11 years agoBetter transition between Gallery and editor
Bobby Georgescu [Mon, 22 Oct 2012 18:13:34 +0000 (11:13 -0700)]
Better transition between Gallery and editor

Bug: 7346155
Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf

11 years agoam cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb...
nicolasroard [Mon, 22 Oct 2012 16:54:57 +0000 (09:54 -0700)]
am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches

* commit 'cd8014124cb3b9354155d84cfc45811280e7d24b':
  Fix the undo/redo/reset menu item state

11 years agoam 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
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

11 years agoMerge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 15:16:33 +0000 (08:16 -0700)]
Import translations. DO NOT MERGE

Change-Id: I330e6753a26acb909bbb72bf9d1c6c5f7ef8e9be
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoam b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 03:32:09 +0000 (20:32 -0700)]
am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches

* commit 'b96be14eb71884e086df66d20c2a02768958565f':
  Tweak transition animations

11 years agoam e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
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

11 years agoMerge "Tweak transition animations" 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

11 years agoTweak transition animations
Bobby Georgescu [Mon, 22 Oct 2012 03:17:08 +0000 (20:17 -0700)]
Tweak transition animations

Bug: 7376109
Change-Id: I28cc8413bda31ff945e8e48dd75b86b2e9d071a8

11 years agoMove new exif lib to gallerycommon.
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

11 years agoFix the undo/redo/reset menu item state
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

11 years agoam e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up
nicolasroard [Mon, 22 Oct 2012 00:19:39 +0000 (17:19 -0700)]
am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up

* commit 'e4614408716f933d5d99247f57d61949e6201fae':
  Prevent unveil direction to change as long as no touch up

11 years agoam c778aab1: Prevent unveil direction to change as long as no touch up
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

11 years agoPrevent 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

11 years agoam e54e5002: am 15a056e3: Fix crash in Curves module
nicolasroard [Sun, 21 Oct 2012 23:40:22 +0000 (16:40 -0700)]
am e54e5002: am 15a056e3: Fix crash in Curves module

* commit 'e54e5002ed50aa66de70d6ccc7ba33c283b92434':
  Fix crash in Curves module

11 years agoam 15a056e3: Fix crash in Curves module
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

11 years agoFix 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

11 years agoam 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten
nicolasroard [Sun, 21 Oct 2012 22:56:29 +0000 (15:56 -0700)]
am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten

* commit '2f4ec4f1e283a5ba92d9986db2e39d6b7e235aa9':
  Fix several issues with crop/straighten

11 years agoam 104165f1: Fix several issues with crop/straighten
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

11 years agoFix 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

11 years agoam afc8c49f: am 4d276f33: Only translate the main panel if we have to.
nicolasroard [Sun, 21 Oct 2012 22:21:52 +0000 (15:21 -0700)]
am afc8c49f: am 4d276f33: Only translate the main panel if we have to.

* commit 'afc8c49fb1d0a806f4a07d2d62729388326ee8bf':
  Only translate the main panel if we have to.

11 years agoam 4d276f33: Only translate the main panel if we have to.
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.

11 years agoOnly 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

11 years agoam b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googl...
nicolasroard [Sun, 21 Oct 2012 20:31:03 +0000 (13:31 -0700)]
am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/

* commit 'b1b1b8f029f460439ad98c16fece08c85af6e5da':
  Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/

11 years agoam 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com...
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/

11 years agoRevert 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

11 years agoam 5d4ba127: am 2daced6b: Fix for active action bar in camera
Doris Liu [Sat, 20 Oct 2012 17:59:10 +0000 (10:59 -0700)]
am 5d4ba127: am 2daced6b: Fix for active action bar in camera

* commit '5d4ba12701ebb090168437fcf39c286a006362a0':
  Fix for active action bar in camera

11 years agoam 2daced6b: Fix for active action bar in camera
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

11 years agoFix 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

11 years agoam a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter.
Sascha Haeberling [Sat, 20 Oct 2012 00:29:52 +0000 (17:29 -0700)]
am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter.

* commit 'a4c85fc1f2b35bacb5ef1269fdc999fe98bbf7f4':
  Adds a tiny planet (stereographic projection) image filter.

11 years agoam 2f879102: Adds a tiny planet (stereographic projection) image filter.
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.

11 years agoAdds 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

11 years agoam e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet
John Hoford [Fri, 19 Oct 2012 23:29:11 +0000 (16:29 -0700)]
am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet

* commit 'e6f7fe76f5d4af7384da81301323b1c92891b804':
  Add the infrastructure to support Tiny Planet

11 years agoam e9c55b28: Add the infrastructure to support Tiny Planet
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

11 years agoam 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip
Bobby Georgescu [Fri, 19 Oct 2012 23:23:11 +0000 (16:23 -0700)]
am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip

* commit '0def633fe16795629930ae9fbe58b91a46603634':
  Fix delete and undo behavior on filmstrip

11 years agoam 41b3cff6: Fix delete and undo behavior on filmstrip
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

11 years agoAdd the infrastructure to support Tiny Planet
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

11 years agoFix delete and undo behavior on filmstrip
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

11 years agoam be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches
nicolasroard [Fri, 19 Oct 2012 23:10:00 +0000 (16:10 -0700)]
am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches

* commit 'be532361141af610e5fbc1270fb3bc467e5f7533':
  Improves swipe gesture

11 years agoam 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches
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

11 years agoMerge "Improves swipe gesture" into gb-ub-photos-arches
nicolasroard [Fri, 19 Oct 2012 23:05:54 +0000 (16:05 -0700)]
Merge "Improves swipe gesture" into gb-ub-photos-arches

11 years agoam 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode.
George Mount [Fri, 19 Oct 2012 22:44:50 +0000 (15:44 -0700)]
am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode.

* commit '6e806709dbfec21b7cdfc2d8186e53568de073b8':
  Remove progress bar when switching to grid mode.

11 years agoImproves swipe gesture
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

11 years agoam 4dd4d80a: Remove progress bar when switching to grid mode.
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.

11 years agoRemove 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

11 years agoam ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into...
Bobby Georgescu [Fri, 19 Oct 2012 21:22:32 +0000 (14:22 -0700)]
am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches

* commit 'ddb30c54ce1f831271ba64c9c69092753e0fd7fd':
  Change number of album rows on large screens

11 years agoam 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos...
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

11 years agoMerge "Change number of album rows on large screens" into gb-ub-photos-arches
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

11 years agoam 921b0a70: am ea78390e: Re-enable crop for new panorama
Mangesh Ghiware [Fri, 19 Oct 2012 20:45:03 +0000 (13:45 -0700)]
am 921b0a70: am ea78390e: Re-enable crop for new panorama

* commit '921b0a70ee6af2553361b66d10439f6a72316b4f':
  Re-enable crop for new panorama

11 years agoam ea78390e: Re-enable crop for new panorama
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

11 years agoRe-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

11 years agoam 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos...
Ruben Brunk [Fri, 19 Oct 2012 20:12:35 +0000 (13:12 -0700)]
am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit '91491889df7410dbd177c4cb708a6d10100c39a2':
  Fix geometry xforms & minor bug.

11 years agoam b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
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.

11 years agoMerge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
Ruben Brunk [Fri, 19 Oct 2012 20:07:07 +0000 (13:07 -0700)]
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

11 years agoam 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode"...
Bobby Georgescu [Fri, 19 Oct 2012 19:59:08 +0000 (12:59 -0700)]
am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches

* commit '5ae82e1e0ce26b7a7a2652df15f9c22dbdd3ff21':
  Saner behavior when deleting in filmstrip mode