OSDN Git Service
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.
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.
The Android Automerger [Mon, 1 Apr 2013 12:56:09 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
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
nicolasroard [Sat, 30 Mar 2013 22:01:33 +0000 (22:01 +0000)]
Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
nicolasroard [Sat, 30 Mar 2013 19:56:20 +0000 (12:56 -0700)]
Fix double-tap behaviour
Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e
nicolasroard [Sat, 30 Mar 2013 19:08:58 +0000 (12:08 -0700)]
Fixes some state synchronization issues
Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
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
nicolasroard [Sat, 30 Mar 2013 02:26:18 +0000 (02:26 +0000)]
Merge "Implements progressive rendering" into gb-ub-photos-bryce
nicolasroard [Fri, 29 Mar 2013 21:41:38 +0000 (14:41 -0700)]
Implements progressive rendering
Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf
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.
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
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.
George Mount [Fri, 29 Mar 2013 23:15:21 +0000 (23:15 +0000)]
Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 16:51:21 +0000 (09:51 -0700)]
Add initial implementation of MediaCache.
Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b
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
Angus Kong [Fri, 29 Mar 2013 00:07:03 +0000 (17:07 -0700)]
Make camera releasing synchronous.
bug:
8502943
Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
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
John Hoford [Fri, 29 Mar 2013 19:14:51 +0000 (19:14 +0000)]
Merge "add flexable ui for parameters" into gb-ub-photos-bryce
John Hoford [Tue, 12 Mar 2013 23:30:10 +0000 (16:30 -0700)]
add flexable ui for parameters
Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921
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.
Michael Kolb [Fri, 29 Mar 2013 17:26:07 +0000 (17:26 +0000)]
Merge "Make camera releasing synchronous." 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
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
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
Angus Kong [Fri, 29 Mar 2013 00:07:03 +0000 (17:07 -0700)]
Make camera releasing synchronous.
bug:
8502943
Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
Bobby Georgescu [Fri, 29 Mar 2013 00:21:24 +0000 (17:21 -0700)]
am
62cc2aa4: Add HeaderGridView implementation
* commit '
62cc2aa4400a4ad03cfc6025e9d25c61015cdef4':
Add HeaderGridView implementation
Bobby Georgescu [Thu, 28 Mar 2013 22:41:32 +0000 (15:41 -0700)]
Add HeaderGridView implementation
Change-Id: Id0e699be0e40310c4919a9d55503edb9b07d4b58
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
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
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
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
nicolasroard [Thu, 28 Mar 2013 06:38:14 +0000 (23:38 -0700)]
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
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.
Ruben Brunk [Thu, 28 Mar 2013 03:53:46 +0000 (03:53 +0000)]
Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
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
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
Angus Kong [Wed, 27 Mar 2013 21:58:31 +0000 (21:58 +0000)]
Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
Angus Kong [Tue, 26 Mar 2013 06:11:43 +0000 (23:11 -0700)]
Make camera calls asynchronous
bug:
8438047
Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
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
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
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
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
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
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
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
nicolasroard [Sat, 23 Mar 2013 05:02:37 +0000 (22:02 -0700)]
Moves ownership of the environment to the pipeline
Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
Angus Kong [Wed, 27 Mar 2013 03:02:33 +0000 (20:02 -0700)]
am
53a06d0d: Remove debug log.
* commit '
53a06d0d76c7f59aa5678f9a8d72f211b3ace773':
Remove debug log.
Angus Kong [Wed, 27 Mar 2013 02:58:34 +0000 (19:58 -0700)]
Remove debug log.
Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43
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.
Angus Kong [Tue, 26 Mar 2013 18:40:40 +0000 (11:40 -0700)]
Add GPSDirection tag using ExifInterface.
bug:
8115825
Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9
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
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
nicolasroard [Tue, 26 Mar 2013 04:40:08 +0000 (21:40 -0700)]
Hides popup indicator on some editors
Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae
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
nicolasroard [Tue, 26 Mar 2013 04:08:47 +0000 (21:08 -0700)]
Hides seekbar in some editors
Change-Id: Ifce385f9a6bf9b741f0873f49d826fbcf453d97c
Doris Liu [Mon, 25 Mar 2013 23:53:38 +0000 (16:53 -0700)]
am
0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce
* commit '
0dd47d9e60cc94f30253a656ec893347160832de':
Adding switcher background back in
Doris Liu [Mon, 25 Mar 2013 23:52:40 +0000 (23:52 +0000)]
Merge "Adding switcher background back in" into gb-ub-photos-bryce
Doris Liu [Mon, 25 Mar 2013 23:05:31 +0000 (16:05 -0700)]
Adding switcher background back in
Fixed switcher background's rotation issue.
Bug:
8436031
Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938
Mangesh Ghiware [Mon, 25 Mar 2013 22:54:14 +0000 (15:54 -0700)]
am
b2a64665: Add album type to albums table.
* commit '
b2a646658c87378b681d85a130db705a39d07171':
Add album type to albums table.
Mangesh Ghiware [Mon, 25 Mar 2013 22:38:48 +0000 (15:38 -0700)]
Add album type to albums table.
Change-Id: Ib4dfb1de9d814d2ee41c5b855b69f09115912e57
The Android Automerger [Mon, 25 Mar 2013 12:56:35 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ruben Brunk [Sat, 23 Mar 2013 04:53:05 +0000 (21:53 -0700)]
am
05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce
* commit '
05762614aa36d5b8b5ed7acd107360a1abc602e3':
Refactoring: removed unnecessary apply calls.
Ruben Brunk [Sat, 23 Mar 2013 04:52:14 +0000 (04:52 +0000)]
Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce
Ruben Brunk [Sat, 23 Mar 2013 04:20:03 +0000 (21:20 -0700)]
Refactoring: removed unnecessary apply calls.
Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6
Baligh Uddin [Sat, 23 Mar 2013 01:22:01 +0000 (18:22 -0700)]
am
2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
2c88c2be6947321fbdab4a2bcd99c5eb204a4d71':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 23 Mar 2013 01:20:46 +0000 (01:20 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Sat, 23 Mar 2013 01:20:27 +0000 (01:20 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Bart Sears [Fri, 22 Mar 2013 22:02:54 +0000 (15:02 -0700)]
am
47657615: Bump up the version number to 1.1.40006
* commit '
476576159c2ecbfaca99c696b5b46c56b30f3d19':
Bump up the version number to 1.1.40006
Bart Sears [Fri, 22 Mar 2013 21:47:19 +0000 (14:47 -0700)]
Bump up the version number to 1.1.40006
Change-Id: Id256fd9a7fdde81ea140b7a58b06f1eb87944b2c
Michael Kolb [Fri, 22 Mar 2013 21:44:39 +0000 (14:44 -0700)]
am
e5265447: Fix NPE in Camera
* commit '
e5265447dddd9d48c4c78192bd21a6aba5588f9f':
Fix NPE in Camera
Michael Kolb [Fri, 22 Mar 2013 21:11:57 +0000 (14:11 -0700)]
Fix NPE in Camera
Bug:
8409508
Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
Baligh Uddin [Fri, 22 Mar 2013 19:00:59 +0000 (12:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifbfe1c4f13e850eed3bddda7434cdb8438640a3b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 22 Mar 2013 19:00:17 +0000 (12:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5037cd2630cb0f95db7ca665133a85c0826240d3
Auto-generated-cl: translation import
Michael Kolb [Fri, 22 Mar 2013 18:19:30 +0000 (11:19 -0700)]
am
f0c33e79: Add renderers only once
* commit '
f0c33e7991f6778534e958551938db8d239957ba':
Add renderers only once
Michael Kolb [Fri, 22 Mar 2013 17:56:12 +0000 (10:56 -0700)]
Add renderers only once
Change-Id: I819c0486d23e358d7d7b989a051da9087fa292a1
nicolasroard [Fri, 22 Mar 2013 06:35:37 +0000 (23:35 -0700)]
am
18027792: Fix problem applying the Fx filter Also adds some debug info
* commit '
180277924bebf6b600ee5ce5adf9ff807a038570':
Fix problem applying the Fx filter Also adds some debug info
nicolasroard [Fri, 22 Mar 2013 04:33:22 +0000 (21:33 -0700)]
Fix problem applying the Fx filter
Also adds some debug info
bug:
8442036
Change-Id: Ife7fd4be664ae011e41969e74c7745da0a7a52f5
John Reck [Fri, 22 Mar 2013 00:40:24 +0000 (17:40 -0700)]
am
b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce
* commit '
b4e071b57e0cc3d07131a44cf55ad5e59538a342':
Revert "New loading model"
John Reck [Fri, 22 Mar 2013 00:38:52 +0000 (00:38 +0000)]
Merge "Revert "New loading model"" into gb-ub-photos-bryce
Bobby Georgescu [Thu, 21 Mar 2013 21:51:33 +0000 (14:51 -0700)]
am
1b88ac53: Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce
* commit '
1b88ac5351975d3373ff9014055962efe00ccc42':
Refactor grid fragments in new gallery
Bobby Georgescu [Thu, 21 Mar 2013 21:49:36 +0000 (21:49 +0000)]
Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce
John Reck [Thu, 21 Mar 2013 21:22:33 +0000 (14:22 -0700)]
Revert "New loading model"
Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
John Reck [Thu, 21 Mar 2013 20:02:49 +0000 (13:02 -0700)]
am
d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
* commit '
d6db9403125261d46e410db60b8a25f1d9014d2b':
Changes for CanvasProvider
John Reck [Thu, 21 Mar 2013 20:01:12 +0000 (20:01 +0000)]
Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
The Android Automerger [Thu, 21 Mar 2013 12:55:56 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jason Noguchi [Thu, 21 Mar 2013 05:08:52 +0000 (22:08 -0700)]
am
8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce
* commit '
8b65a2a7a415f80e54f993973661b4060e6384f5':
Removing obsolete test.
Jason Noguchi [Thu, 21 Mar 2013 05:07:14 +0000 (05:07 +0000)]
Merge "Removing obsolete test." into gb-ub-photos-bryce
Doris Liu [Thu, 21 Mar 2013 03:22:55 +0000 (20:22 -0700)]
am
a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce
* commit '
a088f92a1e18c64231da6b693bb541ace8d8f952':
Fix for record button not responding
Doris Liu [Thu, 21 Mar 2013 03:21:18 +0000 (03:21 +0000)]
Merge "Fix for record button not responding" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Mar 2013 02:58:40 +0000 (19:58 -0700)]
am
3024aa22: Don\'t show the original image in the Curves editor
* commit '
3024aa22d372c0d6608b143a0c46b86c2104f9b1':
Don't show the original image in the Curves editor
nicolasroard [Thu, 21 Mar 2013 02:48:49 +0000 (19:48 -0700)]
Don't show the original image in the Curves editor
Change-Id: I884f6113c5b39d02b8b1f217ce8bec5fd19aaf4e
nicolasroard [Thu, 21 Mar 2013 02:48:30 +0000 (19:48 -0700)]
am
d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
* commit '
d37039a9222b740b7c3f10626af91d2a351c89f3':
Fix crashes with RS filters
nicolasroard [Thu, 21 Mar 2013 02:46:52 +0000 (02:46 +0000)]
Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
nicolasroard [Wed, 20 Mar 2013 21:55:48 +0000 (14:55 -0700)]
Fix crashes with RS filters
bug:
8418537
Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365
Doris Liu [Thu, 21 Mar 2013 02:25:47 +0000 (19:25 -0700)]
Fix for record button not responding
Bug:
8437944
Change-Id: I0393434d094b9288232c70b2f65cd5eb4d0719a4
Ruben Brunk [Thu, 21 Mar 2013 01:46:10 +0000 (18:46 -0700)]
am
5455ac56: Added accessability description for filter buttons.
* commit '
5455ac56cbde7505687cd885b62f7a9d03d826b2':
Added accessability description for filter buttons.
Jason Noguchi [Thu, 21 Mar 2013 01:33:20 +0000 (18:33 -0700)]
Removing obsolete test.
Change-Id: I061846d42d7cbe0a115724060a9600cef6e7433c