OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb...
nicolasroard [Wed, 24 Oct 2012 18:40:44 +0000 (11:40 -0700)]
am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches

* commit '2281b682c459a978391a8cbf54e8944ea4937f40':
  Save the image when applying tiny planet

11 years agoam ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
nicolasroard [Wed, 24 Oct 2012 18:39:17 +0000 (11:39 -0700)]
am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches

* commit 'ca05711f0e6f788f0e2937fef04599d612911ca6':
  Save the image when applying tiny planet

11 years agoMerge "Save the image when applying tiny planet" into gb-ub-photos-arches
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

11 years agoSave the image when applying tiny planet
nicolasroard [Wed, 24 Oct 2012 18:31:57 +0000 (11:31 -0700)]
Save the image when applying tiny planet

bug:7403622
Change-Id: Ic199b163d6418b6d45c2da10b915f2088dd52e16

11 years agoam 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub...
John Hoford [Wed, 24 Oct 2012 18:18:45 +0000 (11:18 -0700)]
am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches

* commit '0b8c14595e65bfbd62be49af2ea631308a10d2d7':
  limited the size of textures to 2048

11 years agoam de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches
John Hoford [Wed, 24 Oct 2012 18:17:00 +0000 (11:17 -0700)]
am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches

* commit 'de00ad0d02f4e328b93a1f5aa393dadf6e685033':
  limited the size of textures to 2048

11 years agoMerge "limited the size of textures to 2048" into gb-ub-photos-arches
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

11 years agolimited the size of textures to 2048
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

11 years agoam a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible...
Bobby Georgescu [Wed, 24 Oct 2012 18:01:00 +0000 (11:01 -0700)]
am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches

* commit 'a0d8436738e4d13b4fdbbe245c126ff33e410857':
  Do not show bottom controls when undo bar is visible

11 years agoam b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 24 Oct 2012 18:00:58 +0000 (11:00 -0700)]
am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 24 Oct 2012 18:00:57 +0000 (11:00 -0700)]
am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '5116f2fd5ae9182e76231dab90a4f116f6d9bcf7':
  Import translations. DO NOT MERGE

11 years agoam 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate...
Bobby Georgescu [Wed, 24 Oct 2012 18:00:53 +0000 (11:00 -0700)]
am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches

* commit '51881e022f428a061188ecb33cc853d31dfb48d1':
  Do not show Camera placeholder when not appropriate

11 years agoam f3958f87: am adee31f0: Use TiledTexture for thumbnails.
Owen Lin [Wed, 24 Oct 2012 18:00:39 +0000 (11:00 -0700)]
am f3958f87: am adee31f0: Use TiledTexture for thumbnails.

* commit 'f3958f87ddd1bd040ab50dea72280df95a4811f1':
  Use TiledTexture for thumbnails.

11 years agoam b682706f: am c60752b2: Use XMP meta-data for correct tiny planets.
Sascha Haeberling [Wed, 24 Oct 2012 18:00:25 +0000 (11:00 -0700)]
am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets.

* commit 'b682706f542e7f43e189a1e608446d5440dea860':
  Use XMP meta-data for correct tiny planets.

11 years agoam 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations.
Ruben Brunk [Wed, 24 Oct 2012 18:00:22 +0000 (11:00 -0700)]
am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations.

* commit '1d86603133491fcc0e96eaa38b14da18161857dc':
  Fixed scaling factor for ImageShow and rotations.

11 years agoam 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches
Ruben Brunk [Wed, 24 Oct 2012 17:59:58 +0000 (10:59 -0700)]
am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches

* commit '5a093c66b71b00a2a70da104d94667a8080e9464':
  Fix so mirror gets applied.

11 years agoam 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread...
Nicolas Roard [Wed, 24 Oct 2012 17:59:57 +0000 (10:59 -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 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP...
Doris Liu [Wed, 24 Oct 2012 17:59:52 +0000 (10:59 -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 c3a48597: am f46da69a: Increased touch tolerance in cropping.
Ruben Brunk [Wed, 24 Oct 2012 17:59:45 +0000 (10:59 -0700)]
am c3a48597: am f46da69a: Increased touch tolerance in cropping.

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

11 years agoam a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb...
Bobby Georgescu [Wed, 24 Oct 2012 16:56:33 +0000 (09:56 -0700)]
am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches

* commit 'a1d04a4aef8117fa0c98b34a931a18a7b46073e3':
  Do not show bottom controls when undo bar is visible

11 years agoMerge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
Bobby Georgescu [Wed, 24 Oct 2012 16:54:02 +0000 (09:54 -0700)]
Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 24 Oct 2012 16:46:18 +0000 (09:46 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 24 Oct 2012 16:44:08 +0000 (09:44 -0700)]
am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 24 Oct 2012 16:42:04 +0000 (09:42 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoDo not show bottom controls when undo bar is visible
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

11 years agoam f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb...
Bobby Georgescu [Wed, 24 Oct 2012 16:17:42 +0000 (09:17 -0700)]
am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches

* commit 'f4a732646e9a4bf6f1f02b4eac0147adca4287c9':
  Do not show Camera placeholder when not appropriate

11 years agoMerge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 15:19:59 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE

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

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

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 15:17:26 +0000 (08:17 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam adee31f0: Use TiledTexture for thumbnails.
Owen Lin [Wed, 24 Oct 2012 08:33:16 +0000 (01:33 -0700)]
am adee31f0: Use TiledTexture for thumbnails.

* commit 'adee31f028d839e7baa8f9e052dc4e4d60b137da':
  Use TiledTexture for thumbnails.

11 years agoUse TiledTexture for thumbnails.
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

11 years agoam c60752b2: Use XMP meta-data for correct tiny planets.
Sascha Haeberling [Wed, 24 Oct 2012 05:47:40 +0000 (22:47 -0700)]
am c60752b2: Use XMP meta-data for correct tiny planets.

* commit 'c60752b28bcdc859b24040f77883568e0838ed74':
  Use XMP meta-data for correct tiny planets.

11 years agoUse XMP meta-data for correct tiny planets.
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

11 years agoam eb75699b: Fixed scaling factor for ImageShow and rotations.
Ruben Brunk [Wed, 24 Oct 2012 05:12:05 +0000 (22:12 -0700)]
am eb75699b: Fixed scaling factor for ImageShow and rotations.

* commit 'eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389':
  Fixed scaling factor for ImageShow and rotations.

11 years agoFixed scaling factor for ImageShow and rotations.
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

11 years agoDo not show Camera placeholder when not appropriate
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

11 years agoam 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches
Ruben Brunk [Wed, 24 Oct 2012 02:43:38 +0000 (19:43 -0700)]
am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches

* commit '3fb2007892a436f704dc168c0549a6c8ee201e4a':
  Fix so mirror gets applied.

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 "Fix so mirror gets applied." into gb-ub-photos-arches
Ruben Brunk [Wed, 24 Oct 2012 02:42:12 +0000 (19:42 -0700)]
Merge "Fix so mirror gets applied." into gb-ub-photos-arches

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 agoFix so mirror gets applied.
Ruben Brunk [Wed, 24 Oct 2012 02:30:00 +0000 (19:30 -0700)]
Fix so mirror gets applied.

Bug: 7402773
Change-Id: I531b795c2f43379e9eaf1ad3b9292e62c867ec3c

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 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 bdfccda8: am a4122499: Reworked crop/transform UI.
Ruben Brunk [Wed, 24 Oct 2012 00:11:43 +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 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API...
John Hoford [Tue, 23 Oct 2012 23:01:24 +0000 (16:01 -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 c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip
Bobby Georgescu [Tue, 23 Oct 2012 22:59:20 +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 f22aa1a2: am 41a3a3be: Fix slider layout
nicolasroard [Tue, 23 Oct 2012 22:36:14 +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 a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb...
nicolasroard [Tue, 23 Oct 2012 22:12:57 +0000 (15:12 -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:12:56 +0000 (15:12 -0700)]
am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit '94fa0565844a6095d52d45cfe366425110666b42':
  Fix NPE

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:29 +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 bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photo...
nicolasroard [Tue, 23 Oct 2012 21:35:28 +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 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead...
Sascha Haeberling [Tue, 23 Oct 2012 21:07:36 +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 bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves
nicolasroard [Tue, 23 Oct 2012 20:08:42 +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 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos...
nicolasroard [Tue, 23 Oct 2012 19:49:37 +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 f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into...
Bobby Georgescu [Tue, 23 Oct 2012 18:54:40 +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 e5a3ff76: am a9f280f9: Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:44:02 +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 cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 18:16:13 +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 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and compar...
nicolasroard [Tue, 23 Oct 2012 17:39:40 +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