OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 719fa31b: Deactivate Vintage & BW Color FX
nicolasroard [Tue, 9 Apr 2013 02:21:29 +0000 (19:21 -0700)]
am 719fa31b: Deactivate Vintage & BW Color FX

* commit '719fa31bc4df6605f45a65feb504d5c4e6e59db3':
  Deactivate Vintage & BW Color FX

11 years agoDeactivate Vintage & BW Color FX
nicolasroard [Tue, 9 Apr 2013 02:06:51 +0000 (19:06 -0700)]
Deactivate Vintage & BW Color FX

bug:8503451
Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587

11 years agoam 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 01:54:18 +0000 (18:54 -0700)]
am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

* commit '387fffa4034e94336d5b2b28bf2cf7d0a9cf6048':
  Add menu item to start the simple editor

11 years agoMerge "Add menu item to start the simple editor" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 01:50:45 +0000 (01:50 +0000)]
Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

11 years agoam 5317e540: Bump up the version number to 1.1.40009
Bart Sears [Tue, 9 Apr 2013 01:49:07 +0000 (18:49 -0700)]
am 5317e540: Bump up the version number to 1.1.40009

* commit '5317e54019bc1c88c82333a9e42882623691270f':
  Bump up the version number to 1.1.40009

11 years agoAdd menu item to start the simple editor
nicolasroard [Tue, 9 Apr 2013 01:16:17 +0000 (18:16 -0700)]
Add menu item to start the simple editor

Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0

11 years agoBump up the version number to 1.1.40009
Bart Sears [Tue, 9 Apr 2013 01:12:07 +0000 (18:12 -0700)]
Bump up the version number to 1.1.40009

Change-Id: Ia266e6493a535cd4ae36fda2fa497195b810ebb4

11 years agoam 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce
Tim Murray [Mon, 8 Apr 2013 22:05:15 +0000 (15:05 -0700)]
am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce

* commit '31721073a7fae162a931f1d4998b12101a98916c':
  Allow use of texture.

11 years agoam a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub...
Tim Murray [Mon, 8 Apr 2013 22:05:15 +0000 (15:05 -0700)]
am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

* commit 'a8d4e88207432fc07385d49245ca2221d6fe0be9':
  Limit creation of greyscale converter RS script.

11 years agoMerge "Allow use of texture." into gb-ub-photos-bryce
Tim Murray [Mon, 8 Apr 2013 22:02:01 +0000 (22:02 +0000)]
Merge "Allow use of texture." into gb-ub-photos-bryce

11 years agoMerge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce
Tim Murray [Mon, 8 Apr 2013 22:01:53 +0000 (22:01 +0000)]
Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

11 years agoAllow use of texture.
Tim Murray [Mon, 8 Apr 2013 21:33:51 +0000 (14:33 -0700)]
Allow use of texture.

Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf

11 years agoLimit creation of greyscale converter RS script.
Tim Murray [Mon, 8 Apr 2013 17:35:09 +0000 (10:35 -0700)]
Limit creation of greyscale converter RS script.

Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067

11 years agoam f1d6d21d: Increase the CHAR LIMIT for color_pick_select
John Hoford [Mon, 8 Apr 2013 21:34:03 +0000 (14:34 -0700)]
am f1d6d21d: Increase the CHAR LIMIT for color_pick_select

* commit 'f1d6d21dfcf59d69a7ba8a3658fcedbf2aa04779':
  Increase the CHAR LIMIT for color_pick_select

11 years agoIncrease the CHAR LIMIT for color_pick_select
John Hoford [Mon, 8 Apr 2013 19:40:17 +0000 (12:40 -0700)]
Increase the CHAR LIMIT for color_pick_select

bug:  8131770
Change-Id: I665316d3ff6ec10fcace8ee1bb9237f4057a4797

11 years agoam 7ce32619: support for simplified computed icons
John Hoford [Mon, 8 Apr 2013 16:14:07 +0000 (09:14 -0700)]
am 7ce32619: support for simplified computed icons

* commit '7ce32619d3f107125d219b80c4041681a0bd85cc':
  support for simplified computed icons

11 years agosupport for simplified computed icons
John Hoford [Fri, 5 Apr 2013 15:48:39 +0000 (08:48 -0700)]
support for simplified computed icons

Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd

11 years agoam 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce
Bart Sears [Fri, 5 Apr 2013 23:54:04 +0000 (16:54 -0700)]
am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

* commit '08ac58de117c2b8c24ef8b4eabca6d25ae581ff3':
  Bump up the version number to 1.1.40008

11 years agoMerge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce
Bart Sears [Fri, 5 Apr 2013 23:51:42 +0000 (23:51 +0000)]
Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

11 years agoam c59be382: Added check to strip out uninitialized EXIF tags.
Ruben Brunk [Fri, 5 Apr 2013 23:44:56 +0000 (16:44 -0700)]
am c59be382: Added check to strip out uninitialized EXIF tags.

* commit 'c59be38287ed3d58f6945d63713b03ac20510c22':
  Added check to strip out uninitialized EXIF tags.

11 years agoAdded check to strip out uninitialized EXIF tags.
Ruben Brunk [Fri, 5 Apr 2013 23:22:55 +0000 (16:22 -0700)]
Added check to strip out uninitialized EXIF tags.

Bug: 8552339
Change-Id: Ib6ae4f59f9e393e5f6b46877a4b2c3b2fe1852d3

11 years agoBump up the version number to 1.1.40008
Bart Sears [Fri, 5 Apr 2013 21:55:58 +0000 (14:55 -0700)]
Bump up the version number to 1.1.40008

Change-Id: I42dce1bc936b54a4d4f72c2179d2f1d9e27f72d7

11 years agoam f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 5 Apr 2013 19:07:13 +0000 (12:07 -0700)]
am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 5 Apr 2013 19:02:23 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 5 Apr 2013 19:02:11 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 18:34:40 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 18:34:17 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 5 Apr 2013 17:11:41 +0000 (10:11 -0700)]
am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce

* commit '5e1e5a5e301491249d24c9f3a4d1014d07e72985':
  Don't add unsupported options to menu

11 years agoMerge "Don't add unsupported options to menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 5 Apr 2013 17:08:40 +0000 (17:08 +0000)]
Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce

11 years agoDon't add unsupported options to menu
Michael Kolb [Fri, 5 Apr 2013 16:52:55 +0000 (09:52 -0700)]
Don't add unsupported options to menu

  Bug: 8549712

Exposure compensation and whitebalance were not checked when added
to the menu.

Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df

11 years agoam 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce
ztenghui [Thu, 4 Apr 2013 23:00:59 +0000 (16:00 -0700)]
am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce

* commit '214f786938fd0924ec89190b5f38d034f0be7291':
  Remove redudant setName

11 years agoam 4f58f875: Bump up the version number to 1.1.40007
Bart Sears [Thu, 4 Apr 2013 23:00:58 +0000 (16:00 -0700)]
am 4f58f875: Bump up the version number to 1.1.40007

* commit '4f58f87598044f3742d6faaf1ac8ff777c7dcffc':
  Bump up the version number to 1.1.40007

11 years agoMerge "Remove redudant setName" into gb-ub-photos-bryce
ztenghui [Thu, 4 Apr 2013 22:57:41 +0000 (22:57 +0000)]
Merge "Remove redudant setName" into gb-ub-photos-bryce

11 years agoBump up the version number to 1.1.40007
Bart Sears [Thu, 4 Apr 2013 22:07:12 +0000 (15:07 -0700)]
Bump up the version number to 1.1.40007

Change-Id: Ia494e2c210f642ec0232394d0cfabaf5e1b8f96a

11 years agoRemove redudant setName
ztenghui [Thu, 4 Apr 2013 17:28:43 +0000 (10:28 -0700)]
Remove redudant setName

Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c

11 years agoam 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photo...
John Hoford [Thu, 4 Apr 2013 15:46:22 +0000 (08:46 -0700)]
am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce

* commit '3b7638527bf8f472bedf99ed412d692e4031d03e':
  fixed the value that quality was getting set to

11 years agoMerge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
John Hoford [Thu, 4 Apr 2013 15:42:50 +0000 (15:42 +0000)]
Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce

11 years agofixed the value that quality was getting set to
John Hoford [Wed, 3 Apr 2013 23:53:04 +0000 (16:53 -0700)]
fixed the value that quality was getting set to

Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4

11 years agoam 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce
Michael Kolb [Wed, 3 Apr 2013 23:12:14 +0000 (16:12 -0700)]
am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce

* commit '56b8463ae34900368f735d9ba75ac39d635ad7cc':
  Adjust camera menu further

11 years agoMerge "Adjust camera menu further" into gb-ub-photos-bryce
Michael Kolb [Wed, 3 Apr 2013 23:09:48 +0000 (23:09 +0000)]
Merge "Adjust camera menu further" into gb-ub-photos-bryce

11 years agoam a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb...
Angus Kong [Wed, 3 Apr 2013 22:45:03 +0000 (15:45 -0700)]
am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce

* commit 'a2dcdfe34f634cc07acfcf92d8829a0373cec969':
  Don't access mParameters dirty bit in other thread

11 years agoMerge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce
Angus Kong [Wed, 3 Apr 2013 22:41:53 +0000 (22:41 +0000)]
Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce

11 years agoAdjust camera menu further
Michael Kolb [Tue, 2 Apr 2013 23:03:04 +0000 (16:03 -0700)]
Adjust camera menu further

Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40

11 years agoam e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 3 Apr 2013 22:01:43 +0000 (15:01 -0700)]
am e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 22:00:41 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 3 Apr 2013 21:58:43 +0000 (21:58 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 3 Apr 2013 21:58:38 +0000 (14:58 -0700)]
am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 21:57:29 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 3 Apr 2013 21:56:08 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 048a61c7: Improve black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 21:09:08 +0000 (14:09 -0700)]
am 048a61c7: Improve black bar to keep camera controls in place

* commit '048a61c7ab3f63688faeb39c253251e58f30c5f8':
  Improve black bar to keep camera controls in place

11 years agoImprove black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 00:48:56 +0000 (17:48 -0700)]
Improve black bar to keep camera controls in place

Bug: 8340996

Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b

11 years agoam 8ce4df01: fix touch action in draw
John Hoford [Wed, 3 Apr 2013 19:34:29 +0000 (12:34 -0700)]
am 8ce4df01: fix touch action in draw

* commit '8ce4df0105e645aed8503c3f03c98c208621911d':
  fix touch action in draw

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:40:22 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:39:53 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:38:16 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:37:40 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE

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

11 years agofix touch action in draw
John Hoford [Wed, 3 Apr 2013 17:58:40 +0000 (10:58 -0700)]
fix touch action in draw

Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d

11 years agoDon't access mParameters dirty bit in other thread
Angus Kong [Wed, 3 Apr 2013 00:59:30 +0000 (17:59 -0700)]
Don't access mParameters dirty bit in other thread

Change-Id: I067dd56975cc908f29ed7ba419572982c55b2063

11 years agoam 2538c992: Fix segfaults in RS filters
nicolasroard [Wed, 3 Apr 2013 06:16:52 +0000 (23:16 -0700)]
am 2538c992: Fix segfaults in RS filters

* commit '2538c992dc70b3eda7487ef68dba0390b2f337d7':
  Fix segfaults in RS filters

11 years agoFix segfaults in RS filters
nicolasroard [Wed, 3 Apr 2013 05:22:37 +0000 (22:22 -0700)]
Fix segfaults in RS filters

We did not recreate the filters in all
cases when the input size change.

bug:8530112
Change-Id: I4cb47498532618271b90e56c01ec63ad991db787

11 years agoam ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
Ruben Brunk [Tue, 2 Apr 2013 23:47:12 +0000 (16:47 -0700)]
am ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce

* commit 'ca926f9c13fdd3f813811b02782d4fb4fb79d7f5':
  Speed improvements for ExifOutputStream.

11 years agoam 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photo...
John Hoford [Tue, 2 Apr 2013 23:47:12 +0000 (16:47 -0700)]
am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce

* commit '2b24604837aa9821d7e5ed409c2164ede803e0c4':
  fix calling Allocation.copyFrom without context

11 years agoMerge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
Ruben Brunk [Tue, 2 Apr 2013 23:47:03 +0000 (23:47 +0000)]
Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce

11 years agoMerge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
John Hoford [Tue, 2 Apr 2013 23:44:40 +0000 (23:44 +0000)]
Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce

11 years agoam 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
Angus Kong [Tue, 2 Apr 2013 23:39:57 +0000 (16:39 -0700)]
am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce

* commit '0e018f44d4ecccd9be27bd4eac04957741ae57d2':
  Make stopPreview synchronous.

11 years agoam 7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb...
Ruben Brunk [Tue, 2 Apr 2013 23:39:56 +0000 (16:39 -0700)]
am 7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce

* commit '7bf0f568f7e09275477f1ff2a4ac107274798329':
  Cleanup sloppy memory handling in ExifOutputStream.

11 years agoMerge "Make stopPreview synchronous." into gb-ub-photos-bryce
Angus Kong [Tue, 2 Apr 2013 23:05:03 +0000 (23:05 +0000)]
Merge "Make stopPreview synchronous." into gb-ub-photos-bryce

11 years agofix calling Allocation.copyFrom without context
John Hoford [Tue, 2 Apr 2013 22:55:55 +0000 (15:55 -0700)]
fix calling Allocation.copyFrom without context

bug:8526929
Change-Id: I407539fae153642ea9be46a2f4102ab827e24164

11 years agoSpeed improvements for ExifOutputStream.
Ruben Brunk [Tue, 2 Apr 2013 20:15:57 +0000 (13:15 -0700)]
Speed improvements for ExifOutputStream.

Change-Id: I7d3ee9c157aefe67734e7b49cfa7868254c134ef

11 years agoMerge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
Ruben Brunk [Tue, 2 Apr 2013 22:19:05 +0000 (22:19 +0000)]
Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce

11 years agoMake stopPreview synchronous.
Angus Kong [Tue, 2 Apr 2013 21:56:43 +0000 (14:56 -0700)]
Make stopPreview synchronous.

bug:8517092
Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6

11 years agoCleanup sloppy memory handling in ExifOutputStream.
Ruben Brunk [Tue, 2 Apr 2013 21:16:22 +0000 (14:16 -0700)]
Cleanup sloppy memory handling in ExifOutputStream.

Change-Id: Ifc34a958a6214fa89ee52cfbdeb6d53baa8cd3fd

11 years agoam 54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos...
Bobby Georgescu [Tue, 2 Apr 2013 20:11:41 +0000 (13:11 -0700)]
am 54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce

* commit '54762e1e909d7bf85dc913414b047be9a499c18a':
  Usage statistics for photo and video capture

11 years agoMerge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 2 Apr 2013 20:09:50 +0000 (20:09 +0000)]
Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce

11 years agoUsage statistics for photo and video capture
Bobby Georgescu [Mon, 1 Apr 2013 22:33:17 +0000 (15:33 -0700)]
Usage statistics for photo and video capture

Bug: 8433834
Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984

11 years agoam 20eb41f8: Fix stickiness issues with UI
nicolasroard [Tue, 2 Apr 2013 05:42:01 +0000 (22:42 -0700)]
am 20eb41f8: Fix stickiness issues with UI

* commit '20eb41f87e35033a783adf76286c10bb1534a56d':
  Fix stickiness issues with UI

11 years agoFix stickiness issues with UI
nicolasroard [Tue, 2 Apr 2013 04:33:20 +0000 (21:33 -0700)]
Fix stickiness issues with UI

The renderGeometryIcon() function shouldn't
be synchronized -- it's independent of the rest
of the pipeline and is only used to apply a given geometry.

Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3

11 years agoam 5bd6e14f: Don\'t try freeing resources on a different thread..
nicolasroard [Tue, 2 Apr 2013 04:42:45 +0000 (21:42 -0700)]
am 5bd6e14f: Don\'t try freeing resources on a different thread..

* commit '5bd6e14f2c2b06943fa542921241b79566b3c6e2':
  Don't try freeing resources on a different thread..

11 years agoDon't try freeing resources on a different thread..
nicolasroard [Tue, 2 Apr 2013 04:33:20 +0000 (21:33 -0700)]
Don't try freeing resources on a different thread..

This call to freeResources happens on the main thread.
It's also not really useful. The geometry instance
shouldn't be shared either.

bug:8522497
Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4

11 years agoam e7aa98e5: Changed editor back button behavior.
Ruben Brunk [Tue, 2 Apr 2013 01:22:22 +0000 (18:22 -0700)]
am e7aa98e5: Changed editor back button behavior.

* commit 'e7aa98e533531f5e82f5de37c24701bc44bc6cd1':
  Changed editor back button behavior.

11 years agoChanged editor back button behavior.
Ruben Brunk [Tue, 2 Apr 2013 00:26:42 +0000 (17:26 -0700)]
Changed editor back button behavior.

Bug: 8522150
Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b

11 years agoam 902a6f7f: Merge "Change panels organization. Also fixes border updates handling...
Ruben Brunk [Tue, 2 Apr 2013 00:00:57 +0000 (17:00 -0700)]
am 902a6f7f: Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce

* commit '902a6f7f6bea14b22fe16f61c55e7ca6306cc210':
  Change panels organization. Also fixes border updates handling.

11 years agoMerge "Change panels organization. Also fixes border updates handling." into gb-ub...
Ruben Brunk [Tue, 2 Apr 2013 00:00:01 +0000 (00:00 +0000)]
Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce

11 years agoChange panels organization. Also fixes border updates handling.
Ruben Brunk [Mon, 1 Apr 2013 23:55:05 +0000 (16:55 -0700)]
Change panels organization. Also fixes border updates handling.

Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe

11 years agoam fa3b121e: Merge "Pie design update" into gb-ub-photos-bryce
Michael Kolb [Mon, 1 Apr 2013 23:47:48 +0000 (16:47 -0700)]
am fa3b121e: Merge "Pie design update" into gb-ub-photos-bryce

* commit 'fa3b121ebfa10149e4c721838a89a76235a8a0c8':
  Pie design update

11 years agoMerge "Pie design update" into gb-ub-photos-bryce
Michael Kolb [Mon, 1 Apr 2013 23:46:06 +0000 (23:46 +0000)]
Merge "Pie design update" into gb-ub-photos-bryce

11 years agoPie design update
Michael Kolb [Tue, 12 Mar 2013 17:24:42 +0000 (10:24 -0700)]
Pie design update

Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb

11 years agoam ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 23:14:26 +0000 (16:14 -0700)]
am ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce

* commit 'ce9ca226e0c24865314e962b3b276b5ed2f2899d':
  Handle InterruptedException in waitDone

11 years agoMerge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 23:13:16 +0000 (23:13 +0000)]
Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce

11 years agoam 0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into...
Ruben Brunk [Mon, 1 Apr 2013 23:09:18 +0000 (16:09 -0700)]
am 0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce

* commit '0b65c2c2fdf5f9ce4d0740697db4c74a9b6cbdc6':
  Added apply UI callbacks for rotate/mirror operations.

11 years agoMerge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos...
Ruben Brunk [Mon, 1 Apr 2013 23:07:42 +0000 (23:07 +0000)]
Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce

11 years agoHandle InterruptedException in waitDone
Angus Kong [Mon, 1 Apr 2013 22:59:09 +0000 (15:59 -0700)]
Handle InterruptedException in waitDone

Dirty bit for mParameters should be set properly if getParameters is not
finished.

bug:8517092
Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0

11 years agoam 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos...
Angus Kong [Mon, 1 Apr 2013 22:19:02 +0000 (15:19 -0700)]
am 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce

* commit '36cac0c2a107a05225185430969975f7dfd81c89':
  Don't use SynchronousQueue to pass results.

11 years agoMerge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 22:17:30 +0000 (22:17 +0000)]
Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce

11 years agoDon't use SynchronousQueue to pass results.
Angus Kong [Mon, 1 Apr 2013 21:30:30 +0000 (14:30 -0700)]
Don't use SynchronousQueue to pass results.

bug:8517092
Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d

11 years agoam 8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 1 Apr 2013 21:48:47 +0000 (14:48 -0700)]
am 8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce

* commit '8f8811fa16147532716e5a4a70fda2f555d20589':
  Usage statistics for camera settings

11 years agoam 6058af44: Enforce bmp type in pool, handle MTP image decode failure
Bobby Georgescu [Mon, 1 Apr 2013 21:45:42 +0000 (14:45 -0700)]
am 6058af44: Enforce bmp type in pool, handle MTP image decode failure

* commit '6058af443b087ba50741cc3e61ec70e830e498fa':
  Enforce bmp type in pool, handle MTP image decode failure

11 years agoMerge "Usage statistics for camera settings" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 1 Apr 2013 21:45:34 +0000 (21:45 +0000)]
Merge "Usage statistics for camera settings" into gb-ub-photos-bryce

11 years agoAdded apply UI callbacks for rotate/mirror operations.
Ruben Brunk [Mon, 1 Apr 2013 21:41:45 +0000 (14:41 -0700)]
Added apply UI callbacks for rotate/mirror operations.

Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640

11 years agoEnforce bmp type in pool, handle MTP image decode failure
Bobby Georgescu [Mon, 1 Apr 2013 20:48:29 +0000 (13:48 -0700)]
Enforce bmp type in pool, handle MTP image decode failure

- GalleryBitmapPool didn't reject bitmap types other than
ARGB_8888 which could lead to problems when a different type
is used for recycling.
- BitmapFactory throws an exception rather than returning null
when image decoding fails and an existing bitmap was supplied
for recycling, even if the failure was not caused by the use
of that bitmap. When decoding things from an MTP device, we
need to handle this since unsupported formats may be returned.

Change-Id: I8cc8aa46f5a741b360e806814991f74a131e9039