OSDN Git Service

android-x86/packages-apps-Gallery2.git
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 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: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 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

11 years agoUsage statistics for camera settings
Bobby Georgescu [Mon, 1 Apr 2013 21:31:40 +0000 (14:31 -0700)]
Usage statistics for camera settings

Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647

11 years agoam bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 18:07:38 +0000 (11:07 -0700)]
am bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce

* commit 'bb746823c1b966562ed4f0f170289cd133f6ff6c':
  Fix NPE when reconnecting camera.

11 years agoMerge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
Angus Kong [Mon, 1 Apr 2013 18:06:06 +0000 (18:06 +0000)]
Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce

11 years agoam 8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos...
Bobby Georgescu [Mon, 1 Apr 2013 17:44:28 +0000 (10:44 -0700)]
am 8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce

* commit '8227ac6685be19bda8e3601c3980847ae8cf3041':
  Preliminary Album grid header in new gallery

11 years agoMerge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 1 Apr 2013 17:42:46 +0000 (17:42 +0000)]
Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce

11 years agoPreliminary Album grid header in new gallery
Bobby Georgescu [Fri, 29 Mar 2013 22:58:42 +0000 (15:58 -0700)]
Preliminary Album grid header in new gallery

Change-Id: I90942de920795aedc5475f23cc3ede459949cc16

11 years agoFix NPE when reconnecting camera.
Angus Kong [Mon, 1 Apr 2013 16:55:24 +0000 (09:55 -0700)]
Fix NPE when reconnecting camera.

bug:8513852
Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3

11 years agoam c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache....
George Mount [Mon, 1 Apr 2013 14:12:35 +0000 (07:12 -0700)]
am c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce

* commit 'c6a1167ec0e461ad202b58614f1a53ec38443654':
  Remove ImageCache from PhotoProvider in favor of MediaCache.

11 years agoMerge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photo...
George Mount [Mon, 1 Apr 2013 14:10:38 +0000 (14:10 +0000)]
Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce

11 years agoam 5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
nicolasroard [Sat, 30 Mar 2013 22:03:08 +0000 (15:03 -0700)]
am 5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce

* commit '5997a0138287fe08f414ffb097c8e088a47bf101':
  Fix double-tap behaviour

11 years agoam 1ad3cd57: Fixes some state synchronization issues
nicolasroard [Sat, 30 Mar 2013 22:03:07 +0000 (15:03 -0700)]
am 1ad3cd57: Fixes some state synchronization issues

* commit '1ad3cd574da4e998e55e4ff4861ff19e2ea982bd':
  Fixes some state synchronization issues

11 years agoMerge "Fix double-tap behaviour" into gb-ub-photos-bryce
nicolasroard [Sat, 30 Mar 2013 22:01:33 +0000 (22:01 +0000)]
Merge "Fix double-tap behaviour" into gb-ub-photos-bryce

11 years agoFix double-tap behaviour
nicolasroard [Sat, 30 Mar 2013 19:56:20 +0000 (12:56 -0700)]
Fix double-tap behaviour

Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e

11 years agoFixes some state synchronization issues
nicolasroard [Sat, 30 Mar 2013 19:08:58 +0000 (12:08 -0700)]
Fixes some state synchronization issues

Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c

11 years agoam ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce
nicolasroard [Sat, 30 Mar 2013 02:28:03 +0000 (19:28 -0700)]
am ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce

* commit 'ad42027590c52fcc522c06d311f28742e0441ec0':
  Implements progressive rendering

11 years agoMerge "Implements progressive rendering" into gb-ub-photos-bryce
nicolasroard [Sat, 30 Mar 2013 02:26:18 +0000 (02:26 +0000)]
Merge "Implements progressive rendering" into gb-ub-photos-bryce

11 years agoImplements progressive rendering
nicolasroard [Fri, 29 Mar 2013 21:41:38 +0000 (14:41 -0700)]
Implements progressive rendering

Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf

11 years agoam e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb...
Ruben Brunk [Sat, 30 Mar 2013 01:04:40 +0000 (18:04 -0700)]
am e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce

* commit 'e0e9fff3ff81faec02b243eabb1502a97a4e4adb':
  Added "discard unsaved changes" behavior for exiting.

11 years agoMerge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
Ruben Brunk [Sat, 30 Mar 2013 01:03:24 +0000 (01:03 +0000)]
Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce

11 years agoRemove ImageCache from PhotoProvider in favor of MediaCache.
George Mount [Wed, 27 Mar 2013 23:53:41 +0000 (16:53 -0700)]
Remove ImageCache from PhotoProvider in favor of MediaCache.

Change-Id: I4e75a094d1dc033ac892c2b95bdc6b6a4a165304

11 years agoam fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos...
George Mount [Fri, 29 Mar 2013 23:16:08 +0000 (16:16 -0700)]
am fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce

* commit 'fe2aa4ba06d045895d0d038627547e02adc6b945':
  Add initial implementation of MediaCache.

11 years agoMerge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
George Mount [Fri, 29 Mar 2013 23:15:21 +0000 (23:15 +0000)]
Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce

11 years agoAdd initial implementation of MediaCache.
George Mount [Mon, 18 Mar 2013 16:51:21 +0000 (09:51 -0700)]
Add initial implementation of MediaCache.

Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b

11 years agoAdded "discard unsaved changes" behavior for exiting.
Ruben Brunk [Fri, 29 Mar 2013 19:36:30 +0000 (12:36 -0700)]
Added "discard unsaved changes" behavior for exiting.

Bug: 7534778
Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac

11 years agoam 3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce
John Hoford [Fri, 29 Mar 2013 19:16:30 +0000 (12:16 -0700)]
am 3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce

* commit '3f3128579b1215142ce71268bdb5be33426d6ccb':
  add flexable ui for parameters

11 years agoMerge "add flexable ui for parameters" into gb-ub-photos-bryce
John Hoford [Fri, 29 Mar 2013 19:14:51 +0000 (19:14 +0000)]
Merge "add flexable ui for parameters" into gb-ub-photos-bryce

11 years agoadd flexable ui for parameters
John Hoford [Tue, 12 Mar 2013 23:30:10 +0000 (16:30 -0700)]
add flexable ui for parameters

Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921

11 years agoam 19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce
Michael Kolb [Fri, 29 Mar 2013 17:28:03 +0000 (10:28 -0700)]
am 19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce

* commit '19f625a13abf3ea418a541299630481f1a7aaa45':
  Make camera releasing synchronous.

11 years agoMerge "Make camera releasing synchronous." into gb-ub-photos-bryce
Michael Kolb [Fri, 29 Mar 2013 17:26:07 +0000 (17:26 +0000)]
Merge "Make camera releasing synchronous." into gb-ub-photos-bryce

11 years agoam d4e3912d: Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce
nicolasroard [Fri, 29 Mar 2013 16:22:26 +0000 (09:22 -0700)]
am d4e3912d: Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce

* commit 'd4e3912d3f6f92da6e2fd0441cd65aef2c4d06da':
  Re-enable caching step in RS filters

11 years agoMerge "Re-enable caching step in RS filters" into gb-ub-photos-bryce
nicolasroard [Fri, 29 Mar 2013 16:20:51 +0000 (16:20 +0000)]
Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce

11 years agoRe-enable caching step in RS filters
nicolasroard [Thu, 28 Mar 2013 23:34:52 +0000 (16:34 -0700)]
Re-enable caching step in RS filters

Bug: 8478659
Bug: 8459181
Bug: 8450339
Bug: 8457323

With the compatibility library, different Scripts instances
actually points to the same thing. We thus need to explicitely
rebind all the variables to the correct script instance before
running RS filters...

Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b

11 years agoMake camera releasing synchronous.
Angus Kong [Fri, 29 Mar 2013 00:07:03 +0000 (17:07 -0700)]
Make camera releasing synchronous.

bug:8502943
Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166

11 years agoam 62cc2aa4: Add HeaderGridView implementation
Bobby Georgescu [Fri, 29 Mar 2013 00:21:24 +0000 (17:21 -0700)]
am 62cc2aa4: Add HeaderGridView implementation

* commit '62cc2aa4400a4ad03cfc6025e9d25c61015cdef4':
  Add HeaderGridView implementation

11 years agoAdd HeaderGridView implementation
Bobby Georgescu [Thu, 28 Mar 2013 22:41:32 +0000 (15:41 -0700)]
Add HeaderGridView implementation

Change-Id: Id0e699be0e40310c4919a9d55503edb9b07d4b58

11 years agoam 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub...
Doris Liu [Thu, 28 Mar 2013 16:52:25 +0000 (09:52 -0700)]
am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

* commit '10bd1e0c43b39ad3314a213822403588141cc7f5':
  Disable preview gestures when shutter is pressed

11 years agoMerge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
Doris Liu [Thu, 28 Mar 2013 16:50:07 +0000 (16:50 +0000)]
Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

11 years agoam 560f959b: Fix deadlock.
nicolasroard [Thu, 28 Mar 2013 06:38:14 +0000 (23:38 -0700)]
am 560f959b: Fix deadlock.

* commit '560f959b659bb510a6ac9a92831534c5dfcf16be':
  Fix deadlock.

11 years agoFix deadlock.
nicolasroard [Thu, 28 Mar 2013 05:10:01 +0000 (22:10 -0700)]
Fix deadlock.

Move the RenderScript context and Resources to CachingPipeline.

bug:8491107
Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d

11 years agoam 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
Ruben Brunk [Thu, 28 Mar 2013 03:55:34 +0000 (20:55 -0700)]
am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce

* commit '4a1caa577565fb64804706de3abf8917ba915a1f':
  Fixed renderscript crashes.

11 years agoMerge "Fixed renderscript crashes." into gb-ub-photos-bryce
Ruben Brunk [Thu, 28 Mar 2013 03:53:46 +0000 (03:53 +0000)]
Merge "Fixed renderscript crashes." into gb-ub-photos-bryce

11 years agoDisable preview gestures when shutter is pressed
Doris Liu [Thu, 28 Mar 2013 00:25:43 +0000 (17:25 -0700)]
Disable preview gestures when shutter is pressed

Bug:8333662
Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31

11 years agoam 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
Angus Kong [Wed, 27 Mar 2013 21:59:32 +0000 (14:59 -0700)]
am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce

* commit '759ef774229db788024b2da6cadefe06fd96cd96':
  Make camera calls asynchronous

11 years agoMerge "Make camera calls asynchronous" into gb-ub-photos-bryce
Angus Kong [Wed, 27 Mar 2013 21:58:31 +0000 (21:58 +0000)]
Merge "Make camera calls asynchronous" into gb-ub-photos-bryce

11 years agoMake camera calls asynchronous
Angus Kong [Tue, 26 Mar 2013 06:11:43 +0000 (23:11 -0700)]
Make camera calls asynchronous

bug:8438047

Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101

11 years agoFixed renderscript crashes.
Ruben Brunk [Wed, 27 Mar 2013 18:19:23 +0000 (11:19 -0700)]
Fixed renderscript crashes.

Bug: 8478659
Bug: 8459181
Bug: 8450339
Bug: 8457323

createFilter() initializes a ton of parameters in the RenderScript
filters.  Using stale parameters from a previous call to createFilter()
causes segfaults.

Change-Id: Id54b956b7fe83be5089b1d47c3bedcca66237ddf

11 years agoam 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub...
Doris Liu [Wed, 27 Mar 2013 18:11:30 +0000 (11:11 -0700)]
am 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce

* commit '4520e5edf00761e8f90e023330d9a90f0de37e70':
  Workaround for switcher popup being cut off on ICS