git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

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.

commit | commitdiff | tree

Michael Kolb [Fri, 29 Mar 2013 17:26:07 +0000 (17:26 +0000)]

Merge "Make camera releasing synchronous." into gb-ub-photos-bryce

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Make camera releasing synchronous.

bug:8502943
Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166

commit | commitdiff | tree

Bobby Georgescu [Fri, 29 Mar 2013 00:21:24 +0000 (17:21 -0700)]

am 62cc2aa4: Add HeaderGridView implementation

* commit '62cc2aa4400a4ad03cfc6025e9d25c61015cdef4':
Add HeaderGridView implementation

commit | commitdiff | tree

Bobby Georgescu [Thu, 28 Mar 2013 22:41:32 +0000 (15:41 -0700)]

Add HeaderGridView implementation

Change-Id: Id0e699be0e40310c4919a9d55503edb9b07d4b58

am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

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

Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Thu, 28 Mar 2013 06:38:14 +0000 (23:38 -0700)]

am 560f959b: Fix deadlock.

* commit '560f959b659bb510a6ac9a92831534c5dfcf16be':
Fix deadlock.

commit | commitdiff | tree

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

am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce

* commit '4a1caa577565fb64804706de3abf8917ba915a1f':
Fixed renderscript crashes.

Merge "Fixed renderscript crashes." into gb-ub-photos-bryce

Disable preview gestures when shutter is pressed

Bug:8333662
Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31

am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce

* commit '759ef774229db788024b2da6cadefe06fd96cd96':
Make camera calls asynchronous

Merge "Make camera calls asynchronous" into gb-ub-photos-bryce

Make camera calls asynchronous

bug:8438047

Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101

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

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

Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce

Workaround for switcher popup being cut off on ICS

Bug: 8390375
Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

nicolasroard [Sat, 23 Mar 2013 05:02:37 +0000 (22:02 -0700)]

Moves ownership of the environment to the pipeline

Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec

am 53a06d0d: Remove debug log.

* commit '53a06d0d76c7f59aa5678f9a8d72f211b3ace773':
Remove debug log.

Remove debug log.

Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43

am dd2e511d: Add GPSDirection tag using ExifInterface.

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

Add GPSDirection tag using ExifInterface.

bug:8115825
Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9

commit | commitdiff | tree

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

commit | commitdiff | tree

nicolasroard [Tue, 26 Mar 2013 04:40:08 +0000 (21:40 -0700)]

Hides popup indicator on some editors

Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae

commit | commitdiff | tree

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

commit | commitdiff | tree

nicolasroard [Tue, 26 Mar 2013 04:08:47 +0000 (21:08 -0700)]

Hides seekbar in some editors

Change-Id: Ifce385f9a6bf9b741f0873f49d826fbcf453d97c

am 0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce

* commit '0dd47d9e60cc94f30253a656ec893347160832de':
Adding switcher background back in

Merge "Adding switcher background back in" into gb-ub-photos-bryce

Adding switcher background back in

Fixed switcher background's rotation issue.
Bug: 8436031

Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938

commit | commitdiff | tree

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.

commit | commitdiff | tree

Mangesh Ghiware [Mon, 25 Mar 2013 22:38:48 +0000 (15:38 -0700)]

Add album type to albums table.

Change-Id: Ib4dfb1de9d814d2ee41c5b855b69f09115912e57

am 05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce

* commit '05762614aa36d5b8b5ed7acd107360a1abc602e3':
Refactoring: removed unnecessary apply calls.

Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce

Refactoring: removed unnecessary apply calls.

Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sat, 23 Mar 2013 01:20:46 +0000 (01:20 +0000)]

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

commit | commitdiff | tree

Baligh Uddin [Sat, 23 Mar 2013 01:20:27 +0000 (01:20 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

am 47657615: Bump up the version number to 1.1.40006

* commit '476576159c2ecbfaca99c696b5b46c56b30f3d19':
Bump up the version number to 1.1.40006

Bump up the version number to 1.1.40006

Change-Id: Id256fd9a7fdde81ea140b7a58b06f1eb87944b2c

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Kolb [Fri, 22 Mar 2013 21:11:57 +0000 (14:11 -0700)]

Fix NPE in Camera

Bug: 8409508

Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Kolb [Fri, 22 Mar 2013 17:56:12 +0000 (10:56 -0700)]

Add renderers only once

Change-Id: I819c0486d23e358d7d7b989a051da9087fa292a1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

am b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce

* commit 'b4e071b57e0cc3d07131a44cf55ad5e59538a342':
Revert "New loading model"

Merge "Revert "New loading model"" into gb-ub-photos-bryce

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Revert "New loading model"

Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed

am d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce

* commit 'd6db9403125261d46e410db60b8a25f1d9014d2b':
Changes for CanvasProvider

Merge "Changes for CanvasProvider" into gb-ub-photos-bryce

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jason Noguchi [Thu, 21 Mar 2013 05:07:14 +0000 (05:07 +0000)]

Merge "Removing obsolete test." into gb-ub-photos-bryce

am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce

* commit 'a088f92a1e18c64231da6b693bb541ace8d8f952':
Fix for record button not responding

Merge "Fix for record button not responding" into gb-ub-photos-bryce

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

nicolasroard [Thu, 21 Mar 2013 02:46:52 +0000 (02:46 +0000)]

Merge "Fix crashes with RS filters" into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Wed, 20 Mar 2013 21:55:48 +0000 (14:55 -0700)]

Fix crashes with RS filters

bug:8418537

Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365

Fix for record button not responding

Bug: 8437944
Change-Id: I0393434d094b9288232c70b2f65cd5eb4d0719a4

am 5455ac56: Added accessability description for filter buttons.

* commit '5455ac56cbde7505687cd885b62f7a9d03d826b2':
Added accessability description for filter buttons.

commit | commitdiff | tree

Jason Noguchi [Thu, 21 Mar 2013 01:33:20 +0000 (18:33 -0700)]

Removing obsolete test.

Change-Id: I061846d42d7cbe0a115724060a9600cef6e7433c

Added accessability description for filter buttons.

Change-Id: I20b780cf54a3fa4beed41845693c87e2369c33ae

commit | commitdiff | tree

Bobby Georgescu [Wed, 20 Mar 2013 22:34:44 +0000 (15:34 -0700)]

Refactor grid fragments in new gallery

Change-Id: I087cd68ddf8a0a23547d85082f146b6effd68f22

Changes for CanvasProvider

Change-Id: I0f90f08f4413717933083d110d5020f494d9ed5f

commit | commitdiff | tree

Bobby Georgescu [Wed, 20 Mar 2013 21:11:40 +0000 (14:11 -0700)]

am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

* commit '7e3756f133965651434f581255646da497b90a51':
Refactor fragment/activity coupling in new Gallery

commit | commitdiff | tree

Bobby Georgescu [Wed, 20 Mar 2013 21:10:23 +0000 (21:10 +0000)]

Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Wed, 20 Mar 2013 19:03:17 +0000 (12:03 -0700)]

Refactor fragment/activity coupling in new Gallery

Change-Id: I7cc54b352197e1975cff286f4add7d0f42637841

commit | commitdiff | tree

Baligh Uddin [Wed, 20 Mar 2013 19:55:10 +0000 (12:55 -0700)]

am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '89afc6b96d924499e44417ddae197372915b6465':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 20 Mar 2013 19:53:55 +0000 (19:53 +0000)]

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 20 Mar 2013 19:53:34 +0000 (19:53 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

commit | commitdiff | tree

Baligh Uddin [Wed, 20 Mar 2013 18:30:57 +0000 (11:30 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 20 Mar 2013 18:30:10 +0000 (11:30 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

nicolasroard [Wed, 20 Mar 2013 17:26:34 +0000 (10:26 -0700)]

am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce

* commit '2ddedb8630e6c2324c41d12509d893c4ec3744f2':
Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability

commit | commitdiff | tree

nicolasroard [Wed, 20 Mar 2013 17:25:25 +0000 (17:25 +0000)]

Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Wed, 20 Mar 2013 15:41:34 +0000 (08:41 -0700)]

Refactor the pipeline
- add a CachingPipeline class
- FilteringPipeline only deals with communication
- fix large critical sections performance issues
- improves stability

bug:8418537

Change-Id: Id18edf71b2e2aec19a8b25fcce711c4acbb1a724

am 00551024: Method added to load scaled resource (with only alpha channel).

* commit '0055102404c767af2cd5fabf70acbc8317e33fe3':
Method added to load scaled resource (with only alpha channel).

Method added to load scaled resource (with only alpha channel).

Change-Id: I1b9a58e0fd4c33c9748ad03f53d635c426a5102c

am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce

* commit '39c14cee9cc748a932d78fb9d430effa12027f7b':
Bump up the version number to 1.1.40005

Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Wed, 20 Mar 2013 03:50:54 +0000 (20:50 -0700)]

am 269d2c86: Add accessor for filters to the source bitmap passed to apply()

* commit '269d2c8602e8893b0bf399324b2072783ba0f37c':
Add accessor for filters to the source bitmap passed to apply()

commit | commitdiff | tree

nicolasroard [Wed, 20 Mar 2013 03:13:33 +0000 (20:13 -0700)]

Add accessor for filters to the source bitmap passed to apply()

Change-Id: I2900c5b799592c388daa9049093ef8c80fa4f5c6

am 8898eaab: Fixed onDestroy ordering for RS context.

* commit '8898eaabfa0cdf70e00078d2dea810f9aab4dfd1':
Fixed onDestroy ordering for RS context.

Fixed onDestroy ordering for RS context.

Bug: 8420637
Change-Id: Iddceaa3aefd3d905bbc7435350b768d10215b1d8

commit | commitdiff | tree

nicolasroard [Tue, 19 Mar 2013 22:11:48 +0000 (15:11 -0700)]

am 33fca9ef: Fix some startup issues, performance issues on ICS

* commit '33fca9ef7f89b60e3b1a361fdf5fc597b3994e74':
Fix some startup issues, performance issues on ICS

commit | commitdiff | tree

nicolasroard [Tue, 19 Mar 2013 21:46:17 +0000 (14:46 -0700)]

Fix some startup issues, performance issues on ICS

Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf

commit | commitdiff | tree

Bobby Georgescu [Tue, 19 Mar 2013 18:40:49 +0000 (11:40 -0700)]

am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce

* commit '94660ff80259917e207fa15a971db1cd619dad5b':
Add album viewing to new Gallery

commit | commitdiff | tree

Bobby Georgescu [Tue, 19 Mar 2013 18:39:02 +0000 (18:39 +0000)]

Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Mon, 18 Mar 2013 21:56:40 +0000 (14:56 -0700)]