OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 9b56ea76: am 1dba3693: am c6a1167e: Merge "Remove ImageCache from PhotoProvider...
George Mount [Mon, 1 Apr 2013 14:17:26 +0000 (07:17 -0700)]
am 9b56ea76: am 1dba3693: am c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce

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

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

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

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 3ea3a6e1: am 9af3e6b8: am 5997a013: Merge "Fix double-tap behaviour" into gb-ub...
nicolasroard [Sat, 30 Mar 2013 22:07:08 +0000 (15:07 -0700)]
am 3ea3a6e1: am 9af3e6b8: am 5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce

* commit '3ea3a6e13f23c995e2577a639499fa857d39c47f':
  Fix double-tap behaviour

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

* commit '42a02931086f20a99d4af1a4ce35a137309d3b15':
  Fixes some state synchronization issues

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

* commit '9af3e6b8d517ca7a1585dc5f373072b8148adb74':
  Fix double-tap behaviour

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

* commit 'de0f9f15badb8cc26cfbdf5e93321a838a6fa6d8':
  Fixes some state synchronization issues

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 dd7b4713: am dd43c25b: am ad420275: Merge "Implements progressive rendering" into...
nicolasroard [Sat, 30 Mar 2013 02:30:30 +0000 (19:30 -0700)]
am dd7b4713: am dd43c25b: am ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce

* commit 'dd7b4713e851e5827a667b59117e8a188b9cc600':
  Implements progressive rendering

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

* commit 'dd43c25b0b2e58a02369d791404f101d9cab1990':
  Implements progressive rendering

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 ee68e231: am f989f148: am e0e9fff3: Merge "Added "discard unsaved changes" behavio...
Ruben Brunk [Sat, 30 Mar 2013 01:09:42 +0000 (18:09 -0700)]
am ee68e231: am f989f148: am e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce

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

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

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

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 e3b42481: am b164f7f6: am fe2aa4ba: Merge "Add initial implementation of MediaCach...
George Mount [Fri, 29 Mar 2013 23:19:10 +0000 (16:19 -0700)]
am e3b42481: am b164f7f6: am fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce

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

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

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

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 5156a6cd: am 8e81dd5c: am 3f312857: Merge "add flexable ui for parameters" into...
John Hoford [Fri, 29 Mar 2013 21:35:49 +0000 (14:35 -0700)]
am 5156a6cd: am 8e81dd5c: am 3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce

* commit '5156a6cd6da43dbb38f7fc7d0797c4e41904f969':
  add flexable ui for parameters

11 years agoam a0815128: am 6c9f88af: am 19f625a1: Merge "Make camera releasing synchronous....
Michael Kolb [Fri, 29 Mar 2013 21:35:06 +0000 (14:35 -0700)]
am a0815128: am 6c9f88af: am 19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce

* commit 'a08151280b80ac2b90b82a292a2bc6d922f3d118':
  Make camera releasing synchronous.

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

* commit '8e81dd5c98d8d13fcc15f1c2a24565c55f815085':
  add flexable ui for parameters

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 6c9f88af: am 19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photo...
Michael Kolb [Fri, 29 Mar 2013 17:29:57 +0000 (10:29 -0700)]
am 6c9f88af: am 19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce

* commit '6c9f88af5336ee07779cc6ef172e8f4524039eb0':
  Make camera releasing synchronous.

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 357f00a1: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Fri, 29 Mar 2013 16:54:36 +0000 (09:54 -0700)]
am 357f00a1: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '357f00a1ce1f1b8584982083f8263e9283117cfa':
  Disable preview gestures when shutter is pressed

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Fri, 29 Mar 2013 16:49:17 +0000 (09:49 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I824c53b5cb75e9076acb41d0e5385499a25f3141

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

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

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

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

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 e1284d2d: am b4723e51: am 62cc2aa4: Add HeaderGridView implementation
Bobby Georgescu [Fri, 29 Mar 2013 00:24:34 +0000 (17:24 -0700)]
am e1284d2d: am b4723e51: am 62cc2aa4: Add HeaderGridView implementation

* commit 'e1284d2df081ed26acf81642474cc3f9712bef81':
  Add HeaderGridView implementation

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

* commit 'b4723e5144712d43f6ab1e91cae5299b8d394a49':
  Add HeaderGridView implementation

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 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 0b69db0c: am 30edf575: am 10bd1e0c: Merge "Disable preview gestures when shutter...
Doris Liu [Thu, 28 Mar 2013 16:55:31 +0000 (09:55 -0700)]
am 0b69db0c: am 30edf575: am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

* commit '0b69db0c888dba0de5499a0c6a6b501fcb006404':
  Disable preview gestures when shutter is pressed

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

* commit '30edf57559cd46e7cdb191a61fd2138bf6ead905':
  Disable preview gestures when shutter is pressed

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 agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 28 Mar 2013 12:56:13 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam b0846578: am 0fe505ec: am 560f959b: Fix deadlock.
nicolasroard [Thu, 28 Mar 2013 06:42:13 +0000 (23:42 -0700)]
am b0846578: am 0fe505ec: am 560f959b: Fix deadlock.

* commit 'b0846578faa364180aafbec9d7a2829cc4960db7':
  Fix deadlock.

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

* commit '0fe505ec49f69dccf3ceb0a409e1acb55a9d9a03':
  Fix deadlock.

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 9b41ee2c: am 7a46da5f: am 4a1caa57: Merge "Fixed renderscript crashes." into gb...
Ruben Brunk [Thu, 28 Mar 2013 03:59:47 +0000 (20:59 -0700)]
am 9b41ee2c: am 7a46da5f: am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce

* commit '9b41ee2c68289e2de29e763a4a217b0273bc6ce0':
  Fixed renderscript crashes.

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

* commit '7a46da5f63f021f6675849fe7ba8b4fe54c9b3d5':
  Fixed renderscript crashes.

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 696ea2d1: am d216ea46: am 759ef774: Merge "Make camera calls asynchronous" into...
Angus Kong [Wed, 27 Mar 2013 22:04:21 +0000 (15:04 -0700)]
am 696ea2d1: am d216ea46: am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce

* commit '696ea2d16cb03fe11df7311e6981943ac4144fd7':
  Make camera calls asynchronous

11 years agoam d216ea46: am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos...
Angus Kong [Wed, 27 Mar 2013 22:01:07 +0000 (15:01 -0700)]
am d216ea46: am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce

* commit 'd216ea465e60d5e447fa2c32ff950bbb1e9d02a9':
  Make camera calls asynchronous

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 346fd2ef: am 3fa3adce: am 4520e5ed: Merge "Workaround for switcher popup being...
Doris Liu [Wed, 27 Mar 2013 18:15:30 +0000 (11:15 -0700)]
am 346fd2ef: am 3fa3adce: am 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce

* commit '346fd2ef30ce7b0841e13e9e63bdba48141f17db':
  Workaround for switcher popup being cut off on ICS

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

* commit '3fa3adcea76a693d51ae29aed0edd283ff1706d3':
  Workaround for switcher popup being cut off on ICS

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

11 years agoMerge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
Doris Liu [Wed, 27 Mar 2013 18:10:18 +0000 (18:10 +0000)]
Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce

11 years agoWorkaround for switcher popup being cut off on ICS
Doris Liu [Wed, 27 Mar 2013 17:52:50 +0000 (10:52 -0700)]
Workaround for switcher popup being cut off on ICS

Bug: 8390375
Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 27 Mar 2013 12:56:22 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam a287a77d: am c2bc7ba3: am 0629d70d: Merge "Moves ownership of the environment...
nicolasroard [Wed, 27 Mar 2013 05:03:32 +0000 (22:03 -0700)]
am a287a77d: am c2bc7ba3: am 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce

* commit 'a287a77d19f056fafd54745d12640684d3897cf6':
  Moves ownership of the environment to the pipeline

11 years agoam c2bc7ba3: am 0629d70d: Merge "Moves ownership of the environment to the pipeline...
nicolasroard [Wed, 27 Mar 2013 05:02:12 +0000 (22:02 -0700)]
am c2bc7ba3: am 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce

* commit 'c2bc7ba3b404ed7556e99e7f9cb50150e242dab1':
  Moves ownership of the environment to the pipeline

11 years agoam 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub...
nicolasroard [Wed, 27 Mar 2013 05:00:19 +0000 (22:00 -0700)]
am 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce

* commit '0629d70d6b03a84741050ac9f3add8db0adad9c6':
  Moves ownership of the environment to the pipeline

11 years agoMerge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce
nicolasroard [Wed, 27 Mar 2013 04:58:13 +0000 (04:58 +0000)]
Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce

11 years agoMoves ownership of the environment to the pipeline
nicolasroard [Sat, 23 Mar 2013 05:02:37 +0000 (22:02 -0700)]
Moves ownership of the environment to the pipeline

Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec

11 years agoam ddacee42: am e1073df5: am 53a06d0d: Remove debug log.
Angus Kong [Wed, 27 Mar 2013 03:05:40 +0000 (20:05 -0700)]
am ddacee42: am e1073df5: am 53a06d0d: Remove debug log.

* commit 'ddacee4298c841ed8c42d40319cf50ccf5c6433d':
  Remove debug log.

11 years agoam e1073df5: am 53a06d0d: Remove debug log.
Angus Kong [Wed, 27 Mar 2013 03:04:10 +0000 (20:04 -0700)]
am e1073df5: am 53a06d0d: Remove debug log.

* commit 'e1073df5751cfd90c81ae30d97319d9b54513578':
  Remove debug log.

11 years agoam 53a06d0d: Remove debug log.
Angus Kong [Wed, 27 Mar 2013 03:02:33 +0000 (20:02 -0700)]
am 53a06d0d: Remove debug log.

* commit '53a06d0d76c7f59aa5678f9a8d72f211b3ace773':
  Remove debug log.

11 years agoRemove debug log.
Angus Kong [Wed, 27 Mar 2013 02:58:34 +0000 (19:58 -0700)]
Remove debug log.

Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43

11 years agoam 44dc1fb2: am 4c11a2b6: am dd2e511d: Add GPSDirection tag using ExifInterface.
Angus Kong [Wed, 27 Mar 2013 00:39:48 +0000 (17:39 -0700)]
am 44dc1fb2: am 4c11a2b6: am dd2e511d: Add GPSDirection tag using ExifInterface.

* commit '44dc1fb2f4c5e9125124fa3f960e837ba4ee3e95':
  Add GPSDirection tag using ExifInterface.

11 years agoam 4c11a2b6: am dd2e511d: Add GPSDirection tag using ExifInterface.
Angus Kong [Wed, 27 Mar 2013 00:36:59 +0000 (17:36 -0700)]
am 4c11a2b6: am dd2e511d: Add GPSDirection tag using ExifInterface.

* commit '4c11a2b6131e8c428451484375f372833c9aa7de':
  Add GPSDirection tag using ExifInterface.

11 years agoam dd2e511d: Add GPSDirection tag using ExifInterface.
Angus Kong [Wed, 27 Mar 2013 00:34:54 +0000 (17:34 -0700)]
am dd2e511d: Add GPSDirection tag using ExifInterface.

* commit 'dd2e511d212ddc438760b23b8cdf5081daccc9ef':
  Add GPSDirection tag using ExifInterface.

11 years agoAdd GPSDirection tag using ExifInterface.
Angus Kong [Tue, 26 Mar 2013 18:40:40 +0000 (11:40 -0700)]
Add GPSDirection tag using ExifInterface.

bug:8115825
Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9

11 years agoam e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Tue, 26 Mar 2013 19:17:47 +0000 (12:17 -0700)]
am e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'e410946c085f6a6b679c5e597abf4b40dbd5ba28':

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Tue, 26 Mar 2013 17:49:40 +0000 (10:49 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Ia8c3c7215b620c1cf453cd01fa8420d50061f879

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 26 Mar 2013 12:56:10 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 136223bb: am 91dd4e7b: am be31e587: Hides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 05:27:53 +0000 (05:27 +0000)]
am 136223bb: am 91dd4e7b: am be31e587: Hides popup indicator on some editors

* commit '136223bbbc4c8968778168e81e565feb7a71a430':
  Hides popup indicator on some editors

11 years agoam 91dd4e7b: am be31e587: Hides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 05:26:30 +0000 (05:26 +0000)]
am 91dd4e7b: am be31e587: Hides popup indicator on some editors

* commit '91dd4e7b12f32d72ab2f7baaf538a939ca7bfaeb':
  Hides popup indicator on some editors

11 years agoam be31e587: Hides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 05:24:44 +0000 (22:24 -0700)]
am be31e587: Hides popup indicator on some editors

* commit 'be31e587c1485fb8e3d7c8b079250ffbdc26e1b9':
  Hides popup indicator on some editors

11 years agoHides popup indicator on some editors
nicolasroard [Tue, 26 Mar 2013 04:40:08 +0000 (21:40 -0700)]
Hides popup indicator on some editors

Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae

11 years agoam 35334379: am 4cdcd1d6: am 91be98c3: Hides seekbar in some editors
nicolasroard [Tue, 26 Mar 2013 04:34:34 +0000 (04:34 +0000)]
am 35334379: am 4cdcd1d6: am 91be98c3: Hides seekbar in some editors

* commit '353343798d22bddd8cca4260e32b8068566f4f09':
  Hides seekbar in some editors

11 years agoam 4cdcd1d6: am 91be98c3: Hides seekbar in some editors
nicolasroard [Tue, 26 Mar 2013 04:33:38 +0000 (04:33 +0000)]
am 4cdcd1d6: am 91be98c3: Hides seekbar in some editors

* commit '4cdcd1d611c31dc4535a124ab9e2a5f00e1dfa14':
  Hides seekbar in some editors

11 years agoam 91be98c3: Hides seekbar in some editors
nicolasroard [Tue, 26 Mar 2013 04:14:16 +0000 (21:14 -0700)]
am 91be98c3: Hides seekbar in some editors

* commit '91be98c35f6c5f19d7629bb29e7261970b2f4c67':
  Hides seekbar in some editors