OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam c0fa9bf7: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on...
Nicolas Roard [Wed, 24 Oct 2012 02:49:54 +0000 (19:49 -0700)]
am c0fa9bf7: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches

* commit 'c0fa9bf7a292a3e530255f7db9196e1a719026b2':
  Support XMP data, fixed read file on another thread

11 years agoam 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread...
Nicolas Roard [Wed, 24 Oct 2012 02:46:42 +0000 (19:46 -0700)]
am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches

* commit '842257ca6aa393a1674d6a88674a28336c6ac63c':
  Support XMP data, fixed read file on another thread

11 years agoam d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb...
Nicolas Roard [Wed, 24 Oct 2012 02:43:37 +0000 (19:43 -0700)]
am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches

* commit 'd3aebee7b35ff969fce3607a5c051d607ca42ec7':
  Support XMP data, fixed read file on another thread

11 years agoMerge "Support XMP data, fixed read file on another thread" 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

11 years agoam 9e7f06db: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a...
Doris Liu [Wed, 24 Oct 2012 02:02:03 +0000 (19:02 -0700)]
am 9e7f06db: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches

* commit '9e7f06dbd7fd91bdb6f664c0254994aaceac3f69':
  Stay in AlbumPage when dismissing a popup from AP

11 years agoam 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP...
Doris Liu [Wed, 24 Oct 2012 01:58:40 +0000 (18:58 -0700)]
am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches

* commit '413c7109c24b7db173032872c5b2e4cd2347d387':
  Stay in AlbumPage when dismissing a popup from AP

11 years agoam 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub...
Doris Liu [Wed, 24 Oct 2012 01:55:23 +0000 (18:55 -0700)]
am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches

* commit '5d3e665359272f8b7b379461ede24918d6b4537e':
  Stay in AlbumPage when dismissing a popup from AP

11 years agoMerge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
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

11 years agoSupport XMP data, fixed read file on another thread
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

11 years agoam 431a58ec: am c3a48597: am f46da69a: Increased touch tolerance in cropping.
Ruben Brunk [Wed, 24 Oct 2012 01:12:46 +0000 (18:12 -0700)]
am 431a58ec: am c3a48597: am f46da69a: Increased touch tolerance in cropping.

* commit '431a58ec1aaaa96504f9f2677c745f08029333cf':
  Increased touch tolerance in cropping.

11 years agoam c3a48597: am f46da69a: Increased touch tolerance in cropping.
Ruben Brunk [Wed, 24 Oct 2012 01:09:25 +0000 (18:09 -0700)]
am c3a48597: am f46da69a: Increased touch tolerance in cropping.

* commit 'c3a485975fbcf3e1dd81016830a7fa209acb1d7d':
  Increased touch tolerance in cropping.

11 years agoam f46da69a: Increased touch tolerance in cropping.
Ruben Brunk [Wed, 24 Oct 2012 01:07:27 +0000 (18:07 -0700)]
am f46da69a: Increased touch tolerance in cropping.

* commit 'f46da69aefd9afe0b4326a2fcea8e33c294136bb':
  Increased touch tolerance in cropping.

11 years agoIncreased touch tolerance in cropping.
Ruben Brunk [Tue, 23 Oct 2012 21:48:58 +0000 (14:48 -0700)]
Increased touch tolerance in cropping.

Bug: 7342281

Change-Id: Ice2ba5f07074b1518e4064bbda489aae7ba17b22

11 years agoStay in AlbumPage when dismissing a popup from AP
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

11 years agoam de327285: am bdfccda8: am a4122499: Reworked crop/transform UI.
Ruben Brunk [Wed, 24 Oct 2012 00:14:26 +0000 (17:14 -0700)]
am de327285: am bdfccda8: am a4122499: Reworked crop/transform UI.

* commit 'de327285c7874bfac0ac18289af746706f2eb87c':
  Reworked crop/transform UI.

11 years agoam bdfccda8: am a4122499: Reworked crop/transform UI.
Ruben Brunk [Wed, 24 Oct 2012 00:11:49 +0000 (17:11 -0700)]
am bdfccda8: am a4122499: Reworked crop/transform UI.

* commit 'bdfccda88176023597fc1867e77411b28ffff63f':
  Reworked crop/transform UI.

11 years agoam a4122499: Reworked crop/transform UI.
Ruben Brunk [Wed, 24 Oct 2012 00:08:12 +0000 (17:08 -0700)]
am a4122499: Reworked crop/transform UI.

* commit 'a41224997ef9be9c0d04534f7b6b9c6b933bfe05':
  Reworked crop/transform UI.

11 years agoReworked crop/transform UI.
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

11 years agoam 5f5710d6: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add...
John Hoford [Tue, 23 Oct 2012 23:04:53 +0000 (16:04 -0700)]
am 5f5710d6: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '5f5710d6de54d19274e60f69653d1053e498c9cb':
  add support for black and white filters, add rotation API to tiny planet

11 years agoam 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API...
John Hoford [Tue, 23 Oct 2012 23:02:17 +0000 (16:02 -0700)]
am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '4b2c4ecbadda7d2f15f4eb933bfe917dfc63fbc8':
  add support for black and white filters, add rotation API to tiny planet

11 years agoam af79e5a1: am c67bc34b: am a850a543: Fix jank when launching editor from Camera...
Bobby Georgescu [Tue, 23 Oct 2012 23:02:08 +0000 (16:02 -0700)]
am af79e5a1: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip

* commit 'af79e5a18bf7cbd39d82646c09a1e9aa33315ec3':
  Fix jank when launching editor from Camera filmstrip

11 years agoam c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip
Bobby Georgescu [Tue, 23 Oct 2012 22:59:12 +0000 (15:59 -0700)]
am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip

* commit 'c67bc34b5466298ce972b9c1b8949d47f0e2cea0':
  Fix jank when launching editor from Camera filmstrip

11 years agoam 67fefdb9: add support for black and white filters, add rotation API to tiny planet
John Hoford [Tue, 23 Oct 2012 22:58:55 +0000 (15:58 -0700)]
am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212':
  add support for black and white filters, add rotation API to tiny planet

11 years agoam a850a543: Fix jank when launching editor from Camera filmstrip
Bobby Georgescu [Tue, 23 Oct 2012 22:56:32 +0000 (15:56 -0700)]
am a850a543: Fix jank when launching editor from Camera filmstrip

* commit 'a850a543225e9f7a72c5a49bb6099573c7efda13':
  Fix jank when launching editor from Camera filmstrip

11 years agoadd support for black and white filters, add rotation API to tiny planet
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

11 years agoFix jank when launching editor from Camera filmstrip
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

11 years agoam cd025e80: am f22aa1a2: am 41a3a3be: Fix slider layout
nicolasroard [Tue, 23 Oct 2012 22:38:50 +0000 (15:38 -0700)]
am cd025e80: am f22aa1a2: am 41a3a3be: Fix slider layout

* commit 'cd025e8054576667838bed64287319b84c038aa4':
  Fix slider layout

11 years agoam f22aa1a2: am 41a3a3be: Fix slider layout
nicolasroard [Tue, 23 Oct 2012 22:36:18 +0000 (15:36 -0700)]
am f22aa1a2: am 41a3a3be: Fix slider layout

* commit 'f22aa1a292d6b69b1f1307cd59e578c3e99e1e60':
  Fix slider layout

11 years agoam 41a3a3be: Fix slider layout
nicolasroard [Tue, 23 Oct 2012 22:33:09 +0000 (15:33 -0700)]
am 41a3a3be: Fix slider layout

* commit '41a3a3be3f263a3b9c902fbec3124a7ea296d525':
  Fix slider layout

11 years agoFix slider layout
nicolasroard [Tue, 23 Oct 2012 22:25:39 +0000 (15:25 -0700)]
Fix slider layout

bug:7383094
Change-Id: I271728577e5a9fa4e1dbff354b37aee5d2aefb5c

11 years agoam ff073e37: am a482d850: am cb993ff1: Merge "Express the borders size in percentages...
nicolasroard [Tue, 23 Oct 2012 22:14:45 +0000 (15:14 -0700)]
am ff073e37: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit 'ff073e37d3d1ca9fcebce580c4a355eb7bdd69a3':
  Express the borders size in percentages

11 years agoam b335ff9d: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 22:14:44 +0000 (15:14 -0700)]
am b335ff9d: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit 'b335ff9dd37b7eaf498e2df999eec19acbc5f9b8':
  Fix NPE

11 years agoam a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb...
nicolasroard [Tue, 23 Oct 2012 22:13:03 +0000 (15:13 -0700)]
am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit 'a482d85068e39eb28cb854bc142d882b95b3b10c':
  Express the borders size in percentages

11 years agoam 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 22:13:02 +0000 (15:13 -0700)]
am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit '94fa0565844a6095d52d45cfe366425110666b42':
  Fix NPE

11 years agoam 26b364d8: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into...
George Mount [Tue, 23 Oct 2012 22:11:28 +0000 (15:11 -0700)]
am 26b364d8: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit '26b364d8c15f60a697dd70e0ad5244d00cdd62c3':
  Fix NPE in detecting panoramas.

11 years agoam cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 22:10:56 +0000 (15:10 -0700)]
am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit 'cb993ff18944a7ba1981406c3c8adf3fe36755c0':
  Express the borders size in percentages

11 years agoam d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
John Reck [Tue, 23 Oct 2012 22:10:55 +0000 (15:10 -0700)]
am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit 'd6453edcdbdad2706d8ce4a4fddd8f7df347b78c':
  Fix NPE

11 years agoMerge "Express the borders size in percentages" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 22:09:53 +0000 (15:09 -0700)]
Merge "Express the borders size in percentages" into gb-ub-photos-arches

11 years agoMerge "Fix NPE" 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

11 years agoam 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos...
George Mount [Tue, 23 Oct 2012 22:08:28 +0000 (15:08 -0700)]
am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit '71647c7af135e397035398aee3d7be7a0ebad670':
  Fix NPE in detecting panoramas.

11 years agoam 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 22:06:44 +0000 (15:06 -0700)]
am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit '7d7f91e1771e67af1fca5f2b3f221968df3de077':
  Fix NPE in detecting panoramas.

11 years agoMerge "Fix NPE in detecting panoramas." 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

11 years agoFix NPE
John Reck [Tue, 23 Oct 2012 20:44:58 +0000 (13:44 -0700)]
Fix NPE

 Bug: 7399438

Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e

11 years agoam bf339ee8: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation...
nicolasroard [Tue, 23 Oct 2012 21:36:41 +0000 (14:36 -0700)]
am bf339ee8: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit 'bf339ee894fbfc2992aca68bab461132ae76ac3f':
  Hide the history panel on rotation

11 years agoam bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photo...
nicolasroard [Tue, 23 Oct 2012 21:35:03 +0000 (14:35 -0700)]
am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit 'bd4ea013d97d896b7865993dc9917313a7040259':
  Hide the history panel on rotation

11 years agoam ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 21:33:47 +0000 (14:33 -0700)]
am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit 'ea6360298ca823634c9f2ee8990546f753288da9':
  Hide the history panel on rotation

11 years agoExpress the borders size in percentages
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Express the borders size in percentages

bug:7379459
Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb

11 years agoMerge "Hide the history panel on rotation" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 21:31:49 +0000 (14:31 -0700)]
Merge "Hide the history panel on rotation" into gb-ub-photos-arches

11 years agoFix NPE in detecting panoramas.
George Mount [Tue, 23 Oct 2012 21:28:58 +0000 (14:28 -0700)]
Fix NPE in detecting panoramas.

 Bug 7398022

Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724

11 years agoHide the history panel on rotation
nicolasroard [Tue, 23 Oct 2012 21:09:53 +0000 (14:09 -0700)]
Hide the history panel on rotation

bug:7386882
Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93

11 years agoam 1400e6a8: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from exter...
Sascha Haeberling [Tue, 23 Oct 2012 21:09:47 +0000 (14:09 -0700)]
am 1400e6a8: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

* commit '1400e6a8ad9fc9d46bd5fde22e05683f75804ccb':
  Make sure we use xmp_toolkit from external instead of the precompiled JAR.

11 years agoam 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead...
Sascha Haeberling [Tue, 23 Oct 2012 21:07:00 +0000 (14:07 -0700)]
am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

* commit '25d08e2bba04fbf88ca138653f7adabc306f1a43':
  Make sure we use xmp_toolkit from external instead of the precompiled JAR.

11 years agoam a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precomp...
Sascha Haeberling [Tue, 23 Oct 2012 21:05:21 +0000 (14:05 -0700)]
am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

* commit 'a681f36f3c0642135a3ad4dcd529cbff08798d53':
  Make sure we use xmp_toolkit from external instead of the precompiled JAR.

11 years agoMerge "Make sure we use xmp_toolkit from external instead of the precompiled JAR...
Sascha Haeberling [Tue, 23 Oct 2012 21:03:32 +0000 (14:03 -0700)]
Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

11 years agoMake sure we use xmp_toolkit from external instead of the precompiled JAR.
Sascha Haeberling [Tue, 23 Oct 2012 20:38:52 +0000 (13:38 -0700)]
Make sure we use xmp_toolkit from external instead of the precompiled JAR.

 Bug: 7400527

Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155

11 years agoam fe23fb64: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 20:10:38 +0000 (13:10 -0700)]
am fe23fb64: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves

* commit 'fe23fb64bd0d75af837d357f69b99c0fc88c85da':
  Fix another potential crash in Curves

11 years agoam bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 20:08:37 +0000 (13:08 -0700)]
am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves

* commit 'bc9d4ccc65df9acd1d3a152bd78bb4c041f1281c':
  Fix another potential crash in Curves

11 years agoam 5d7e98f7: Fix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 20:05:46 +0000 (13:05 -0700)]
am 5d7e98f7: Fix another potential crash in Curves

* commit '5d7e98f781fbd450295850d00adfb50540d53b3f':
  Fix another potential crash in Curves

11 years agoFix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 19:59:16 +0000 (12:59 -0700)]
Fix another potential crash in Curves

bug:7379140
Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080

11 years agoam 20a2ca2e: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into...
nicolasroard [Tue, 23 Oct 2012 19:52:08 +0000 (12:52 -0700)]
am 20a2ca2e: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit '20a2ca2ef08fda5554976b67fb50480c607898a1':
  Fix flickering in geometry panel

11 years agoam 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos...
nicolasroard [Tue, 23 Oct 2012 19:49:30 +0000 (12:49 -0700)]
am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit '0b44017c53fabaa7a9434bf21708a94b48a5db52':
  Fix flickering in geometry panel

11 years agoam 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 19:47:27 +0000 (12:47 -0700)]
am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit '361f6234c02207b2d812db0b2aeed267013c9a1f':
  Fix flickering in geometry panel

11 years agoMerge "Fix flickering in geometry panel" into gb-ub-photos-arches
nicolasroard [Tue, 23 Oct 2012 19:45:50 +0000 (12:45 -0700)]
Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

11 years agoFix flickering in geometry panel
nicolasroard [Tue, 23 Oct 2012 19:18:54 +0000 (12:18 -0700)]
Fix flickering in geometry panel

bug:7344214
Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5

11 years agoam 301531ef: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstri...
Bobby Georgescu [Tue, 23 Oct 2012 18:55:51 +0000 (11:55 -0700)]
am 301531ef: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit '301531ef59957971bb99ae4be0c60a896e850770':
  Show Panorama viewer button in filmstrip mode

11 years agoam f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into...
Bobby Georgescu [Tue, 23 Oct 2012 18:54:17 +0000 (11:54 -0700)]
am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit 'f30096b4f1f3de6fd4c95e706c10cdfd72a5db3b':
  Show Panorama viewer button in filmstrip mode

11 years agoam c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos...
Bobby Georgescu [Tue, 23 Oct 2012 18:52:53 +0000 (11:52 -0700)]
am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit 'c162c8b70b795e95ebe53154ddb86ecf188eade0':
  Show Panorama viewer button in filmstrip mode

11 years agoMerge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
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

11 years agoam 5ba40c19: am e5a3ff76: am a9f280f9: Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:47:05 +0000 (11:47 -0700)]
am 5ba40c19: am e5a3ff76: am a9f280f9: Add copyright notices

* commit '5ba40c19929438e1eb64c16a8ef07247e79fc43b':
  Add copyright notices

11 years agoam e5a3ff76: am a9f280f9: Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:44:42 +0000 (11:44 -0700)]
am e5a3ff76: am a9f280f9: Add copyright notices

* commit 'e5a3ff7692de92739645d97d72b5bdc599fd6fbf':
  Add copyright notices

11 years agoam a9f280f9: Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:42:32 +0000 (11:42 -0700)]
am a9f280f9: Add copyright notices

* commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1':
  Add copyright notices

11 years agoShow Panorama viewer button in filmstrip mode
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

11 years agoAdd copyright notices
nicolasroard [Tue, 23 Oct 2012 18:26:38 +0000 (11:26 -0700)]
Add copyright notices

bug:7387634
Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1

11 years agoam 20da13c5: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 18:19:22 +0000 (11:19 -0700)]
am 20da13c5: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves

* commit '20da13c584b0997562fd75ae352f769acf8aa278':
  Fix slow / jerky tracking in Curves

11 years agoam cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 18:16:44 +0000 (11:16 -0700)]
am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'cdaa77d200c27a7fa2ba5be03bfcd24487cdcb58':
  Fix slow / jerky tracking in Curves

11 years agoam ec995b6b: Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 18:14:20 +0000 (11:14 -0700)]
am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc':
  Fix slow / jerky tracking in Curves

11 years agoFix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 17:51:42 +0000 (10:51 -0700)]
Fix slow / jerky tracking in Curves

bug:7394837
Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91

11 years agoam 1ecc749b: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modul...
nicolasroard [Tue, 23 Oct 2012 17:42:16 +0000 (10:42 -0700)]
am 1ecc749b: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '1ecc749b57a5dbde443ae9baf008653829f7c3e7':
  Shows filtered images in geometry modules and comparison.

11 years agoam 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and compar...
nicolasroard [Tue, 23 Oct 2012 17:39:43 +0000 (10:39 -0700)]
am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '488547b08f909a2f35433764fc97a5f8c7c990df':
  Shows filtered images in geometry modules and comparison.

11 years agoam 2569df23: Merge "Shows filtered images in geometry modules and comparison." into...
nicolasroard [Tue, 23 Oct 2012 17:36:47 +0000 (10:36 -0700)]
am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '2569df233987d1f43400a813ceb2ce72c738a4c3':
  Shows filtered images in geometry modules and comparison.

11 years agoMerge "Shows filtered images in geometry modules and comparison." into gb-ub-photos...
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

11 years agoam 76b4bea4: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for...
George Mount [Tue, 23 Oct 2012 17:33:13 +0000 (10:33 -0700)]
am 76b4bea4: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '76b4bea4e2cb77546df37bc8b674c0154c64af82':
  Ensure photo sphere icon shows for panoramas.

11 years agoam 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into...
George Mount [Tue, 23 Oct 2012 17:31:00 +0000 (10:31 -0700)]
am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '3bfbae1d63fc755b8fef3b200912b03a1f3ec3a9':
  Ensure photo sphere icon shows for panoramas.

11 years agoam 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos...
George Mount [Tue, 23 Oct 2012 17:28:35 +0000 (10:28 -0700)]
am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '24af89b96e824e4a5f9053c2024f507087117c22':
  Ensure photo sphere icon shows for panoramas.

11 years agoMerge "Ensure photo sphere icon shows for panoramas." 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

11 years agoShows filtered images in geometry modules and comparison.
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

11 years agoEnsure photo sphere icon shows for panoramas.
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

11 years agoam add322b8: am 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 16:01:04 +0000 (09:01 -0700)]
am add322b8: am 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit 'add322b83c852e090edd21be917b2680e98b3ba3':
  Import translations. DO NOT MERGE

11 years agoam f924cac6: am caace51d: Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 16:01:03 +0000 (09:01 -0700)]
am f924cac6: am caace51d: Import translations. DO NOT MERGE

* commit 'f924cac66bd4a39247ebe641bbd0c09ea7ef318f':
  Import translations. DO NOT MERGE

11 years agoam 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:58:31 +0000 (08:58 -0700)]
am 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit '306176fbd21ece931ccff21bbe6cfa04a1cc751d':
  Import translations. DO NOT MERGE

11 years agoam caace51d: Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:58:30 +0000 (08:58 -0700)]
am caace51d: Import translations. DO NOT MERGE

* commit 'caace51d7168d1cb2467268379c0883c4cb69853':
  Import translations. DO NOT MERGE

11 years agoam 822c182e: Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:58:04 +0000 (08:58 -0700)]
am 822c182e: Import translations. DO NOT MERGE

* commit '822c182e8a76e5e9fcbfdce5f4e1f65f2828d511':
  Import translations. DO NOT MERGE

11 years agoam 7c08064b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:57:00 +0000 (08:57 -0700)]
am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit '7c08064bc790dff6ab9da24d8aa07a96c9185b6a':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:55:17 +0000 (07:55 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:54:40 +0000 (07:54 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:53:21 +0000 (07:53 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 190c2285: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI
John Hoford [Tue, 23 Oct 2012 03:04:02 +0000 (20:04 -0700)]
am 190c2285: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit '190c22855d5aaaf3485e22d1752a9ee799d9c048':
  on entry check if Tiny Planet if not remove UI

11 years agoam ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI
John Hoford [Tue, 23 Oct 2012 03:00:55 +0000 (20:00 -0700)]
am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit 'ea7366a517c9142a8e35d19a64e9964bb96ad2a8':
  on entry check if Tiny Planet if not remove UI

11 years agoam 5fbfe6f1: on entry check if Tiny Planet if not remove UI
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

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