OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 14 Mar 2013 04:48:40 +0000 (04:48 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoam bbf96f27: Merge "Fix photo editor RS allocation on orientation change." into gb...
Nicolas Roard [Thu, 14 Mar 2013 03:32:03 +0000 (20:32 -0700)]
am bbf96f27: Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce

* commit 'bbf96f2785c3f3f91d497b18f8b2dd9c0cb2b9b6':
  Fix photo editor RS allocation on orientation change.

11 years agoMerge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce
Nicolas Roard [Thu, 14 Mar 2013 03:30:34 +0000 (03:30 +0000)]
Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce

11 years agoam c6a12b24: Merge "add icon to indicate menu" into gb-ub-photos-bryce
John Hoford [Thu, 14 Mar 2013 03:24:55 +0000 (20:24 -0700)]
am c6a12b24: Merge "add icon to indicate menu" into gb-ub-photos-bryce

* commit 'c6a12b24b4662ba9fa7cc8c7d072ecb0a8f79e46':
  add icon to indicate menu

11 years agoMerge "add icon to indicate menu" into gb-ub-photos-bryce
John Hoford [Thu, 14 Mar 2013 03:23:28 +0000 (03:23 +0000)]
Merge "add icon to indicate menu" into gb-ub-photos-bryce

11 years agoadd icon to indicate menu
John Hoford [Thu, 14 Mar 2013 03:17:43 +0000 (20:17 -0700)]
add icon to indicate menu

Change-Id: I3327751cd78dd9b654e51e99a6756967c6fb82f5

11 years agoFix photo editor RS allocation on orientation change.
Ruben Brunk [Thu, 14 Mar 2013 02:41:04 +0000 (19:41 -0700)]
Fix photo editor RS allocation on orientation change.

Bug: 8383050
Change-Id: Ic549d1f3fae22238dda08260cd7410c6054ce7b1

11 years agoam 5bedc41e: Merge "Use Model-View-Controller pattern on video module" into gb-ub...
Doris Liu [Thu, 14 Mar 2013 02:08:15 +0000 (19:08 -0700)]
am 5bedc41e: Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce

* commit '5bedc41eb4bf30fe277de3977db8331f970c8f0b':
  Use Model-View-Controller pattern on video module

11 years agoMerge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce
Doris Liu [Thu, 14 Mar 2013 02:06:16 +0000 (02:06 +0000)]
Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce

11 years agoam 6e6a5243: Exif parser modifications.
Ruben Brunk [Thu, 14 Mar 2013 01:07:47 +0000 (18:07 -0700)]
am 6e6a5243: Exif parser modifications.

* commit '6e6a524390d8ddebce5de0dcc8ae258e652ec80a':
  Exif parser modifications.

11 years agoExif parser modifications.
Ruben Brunk [Tue, 12 Mar 2013 02:00:12 +0000 (19:00 -0700)]
Exif parser modifications.

Bug: 8018327
Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8

11 years agoUse Model-View-Controller pattern on video module
Doris Liu [Wed, 13 Mar 2013 02:24:28 +0000 (19:24 -0700)]
Use Model-View-Controller pattern on video module

Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa

11 years agoam 8cc88f03: Merge "size tweak" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 13 Mar 2013 22:13:56 +0000 (15:13 -0700)]
am 8cc88f03: Merge "size tweak" into gb-ub-photos-bryce

* commit '8cc88f0320a4b62f8256fb33faebf0f75cf172e0':
  size tweak

11 years agoMerge "size tweak" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 13 Mar 2013 22:12:24 +0000 (22:12 +0000)]
Merge "size tweak" into gb-ub-photos-bryce

11 years agosize tweak
John Reck [Wed, 13 Mar 2013 22:11:14 +0000 (15:11 -0700)]
size tweak

Change-Id: I2153774ef05f67b313f86c4552ccd0471fae1f6e

11 years agoam 215bb750: Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
Angus Kong [Wed, 13 Mar 2013 22:01:46 +0000 (15:01 -0700)]
am 215bb750: Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce

* commit '215bb750dcb21e449227acb3cdf76da3cb6173a2':
  Horizontal scrollable filmstrip view.

11 years agoMerge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
Angus Kong [Wed, 13 Mar 2013 21:39:32 +0000 (21:39 +0000)]
Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce

11 years agoam f069751e: Merge "Sharing support for albums, bulk operations infrastructure" into...
Bobby Georgescu [Wed, 13 Mar 2013 21:31:30 +0000 (14:31 -0700)]
am f069751e: Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce

* commit 'f069751e1adcb85ce14934b7a275f1276f5490a8':
  Sharing support for albums, bulk operations infrastructure

11 years agoMerge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos...
Bobby Georgescu [Wed, 13 Mar 2013 21:30:18 +0000 (21:30 +0000)]
Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce

11 years agoHorizontal scrollable filmstrip view.
Angus Kong [Fri, 22 Feb 2013 22:02:25 +0000 (14:02 -0800)]
Horizontal scrollable filmstrip view.

Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2

11 years agoam 730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into...
Bobby Georgescu [Wed, 13 Mar 2013 21:23:21 +0000 (14:23 -0700)]
am 730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce

* commit '730685b2b4c286d32d97f92283d12254df284f0c':
  Add coarse grained events for camera mode, filmstrip stats

11 years agoMerge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos...
Bobby Georgescu [Wed, 13 Mar 2013 21:21:32 +0000 (21:21 +0000)]
Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce

11 years agoSharing support for albums, bulk operations infrastructure
Bobby Georgescu [Sat, 9 Mar 2013 04:15:15 +0000 (20:15 -0800)]
Sharing support for albums, bulk operations infrastructure

Change-Id: I590f60ab85ffbd9cf9d7cd9982627604fa1b427f

11 years agoam d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
Michael Kolb [Wed, 13 Mar 2013 21:04:59 +0000 (14:04 -0700)]
am d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce

* commit 'd52594cf7993e156491a806ade65b6f85e639b20':
  Fix bug in exposure setting

11 years agoMerge "Fix bug in exposure setting" into gb-ub-photos-bryce
Michael Kolb [Wed, 13 Mar 2013 21:00:41 +0000 (21:00 +0000)]
Merge "Fix bug in exposure setting" into gb-ub-photos-bryce

11 years agoam 4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets...
Ruben Brunk [Wed, 13 Mar 2013 21:01:49 +0000 (14:01 -0700)]
am 4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS.  Gets rid of leaked threads." into gb-ub-photos-bryce

* commit '4563676bbf9d32a3dce180123bca7adc6940809e':
  Added locking for FilteringPipeline and ImageFilterRS.  Gets rid of leaked threads.

11 years agoMerge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked...
Ruben Brunk [Wed, 13 Mar 2013 20:59:48 +0000 (20:59 +0000)]
Merge "Added locking for FilteringPipeline and ImageFilterRS.  Gets rid of leaked threads." into gb-ub-photos-bryce

11 years agoFix bug in exposure setting
Michael Kolb [Wed, 13 Mar 2013 20:41:01 +0000 (13:41 -0700)]
Fix bug in exposure setting

  Bug: 8314498

Limit exposure compensation to -3 to 3;
some devices offer -4 to 4, and we don't have icons
covering that range

Change-Id: I2b334733c7630d57682b905d41dfe2ceb5641133

11 years agoAdded locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
Ruben Brunk [Wed, 13 Mar 2013 07:47:03 +0000 (00:47 -0700)]
Added locking for FilteringPipeline and ImageFilterRS.  Gets rid of leaked threads.

Bug: 8373600
Bug: 8363001
Bug: 8344345
Bug: 8264659

This CL fixes several things:
- FilteringPipeline no longer leaks a handler thread every time photoeditor is reopened.
- ImageFilterRS no longer leaks an RS context and thread every time photoeditor is reopened.
- ImageFilterRS now uses locking.
- ImageFilterRS no longer leaks Bitmap references or static renderscript allocations.

Change-Id: I79ebde1a8ba8ad689791c2af8db0c3c907e06399

11 years agoam d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce
Michael Kolb [Wed, 13 Mar 2013 17:52:51 +0000 (10:52 -0700)]
am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce

* commit 'd15e43fb5295ae0cf6af45663043d603e2e181ba':
  Fix Monkey NPE

11 years agoMerge "Fix Monkey NPE" into gb-ub-photos-bryce
Michael Kolb [Wed, 13 Mar 2013 17:50:24 +0000 (17:50 +0000)]
Merge "Fix Monkey NPE" into gb-ub-photos-bryce

11 years agoFix Monkey NPE
Michael Kolb [Wed, 13 Mar 2013 17:47:06 +0000 (10:47 -0700)]
Fix Monkey NPE

  Bug: 8377895

Change-Id: Iaa89330e8c69961d700e0aab91d7855d579874f0

11 years agoAdd coarse grained events for camera mode, filmstrip stats
Bobby Georgescu [Wed, 13 Mar 2013 16:45:18 +0000 (09:45 -0700)]
Add coarse grained events for camera mode, filmstrip stats

Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16

11 years agoam f37648b8: Usage statistics collection for camera module, filmstrip
Bobby Georgescu [Wed, 13 Mar 2013 16:23:06 +0000 (09:23 -0700)]
am f37648b8: Usage statistics collection for camera module, filmstrip

* commit 'f37648b877bf6029d7afead31e965b473114c89c':
  Usage statistics collection for camera module, filmstrip

11 years agoUsage statistics collection for camera module, filmstrip
Bobby Georgescu [Wed, 13 Mar 2013 05:45:17 +0000 (22:45 -0700)]
Usage statistics collection for camera module, filmstrip

Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d

11 years agoam e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Mar 2013 01:39:44 +0000 (18:39 -0700)]
am e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce

* commit 'e5e61f884c59d5ba15aae6b228c4bcaad58e0642':
  Fix preview synchronization

11 years agoMerge "Fix preview synchronization" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Mar 2013 01:38:27 +0000 (01:38 +0000)]
Merge "Fix preview synchronization" into gb-ub-photos-bryce

11 years agoFix preview synchronization
nicolasroard [Wed, 13 Mar 2013 01:23:41 +0000 (18:23 -0700)]
Fix preview synchronization

Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04

11 years agoam 8a3ab566: fix build
John Reck [Wed, 13 Mar 2013 00:24:21 +0000 (17:24 -0700)]
am 8a3ab566: fix build

* commit '8a3ab5665c57590b9f41f75c4a2fdf1ea1cffa00':
  fix build

11 years agofix build
John Reck [Wed, 13 Mar 2013 00:22:48 +0000 (17:22 -0700)]
fix build

Change-Id: I41898041ad2e6d59973af30680288c436f3c6357

11 years agoam 2f205d54: basic activated support
John Reck [Wed, 13 Mar 2013 00:02:10 +0000 (17:02 -0700)]
am 2f205d54: basic activated support

* commit '2f205d54c88ea3f6b1a1a0630201fdb10b0689e2':
  basic activated support

11 years agoam af0343eb: Use viewpager
John Reck [Wed, 13 Mar 2013 00:02:09 +0000 (17:02 -0700)]
am af0343eb: Use viewpager

* commit 'af0343eb04ecd0e1895042e0f0656db0cc52dd4c':
  Use viewpager

11 years agobasic activated support
John Reck [Tue, 12 Mar 2013 23:11:18 +0000 (16:11 -0700)]
basic activated support

Change-Id: If1c1faf42311ddbc76b617bff5f3c6bdafdef5d1

11 years agoUse viewpager
John Reck [Tue, 12 Mar 2013 20:46:33 +0000 (13:46 -0700)]
Use viewpager

Change-Id: Icd320799ce1e13815e34b2a0e45a9f6a47736de3

11 years agoam 9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into...
nicolasroard [Tue, 12 Mar 2013 22:50:19 +0000 (15:50 -0700)]
am 9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce

* commit '9eaa85a0384f1c39c16dedb486aaab2b32911d04':
  Add loading resources helper functions to ImageFilterRS

11 years agoMerge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos...
nicolasroard [Tue, 12 Mar 2013 22:48:50 +0000 (22:48 +0000)]
Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce

11 years agoAdd loading resources helper functions to ImageFilterRS
nicolasroard [Tue, 12 Mar 2013 21:30:33 +0000 (14:30 -0700)]
Add loading resources helper functions to ImageFilterRS

Change-Id: I79b4996b5da0fa05536f2f53f770d01e9735b96c

11 years agoam b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
George Mount [Tue, 12 Mar 2013 20:56:29 +0000 (13:56 -0700)]
am b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce

* commit 'b3831f7714715f2e1693b89d5bc4854381918bbc':
  Add delete cascade for Accounts.

11 years agoMerge "Add delete cascade for Accounts." into gb-ub-photos-bryce
George Mount [Tue, 12 Mar 2013 20:53:21 +0000 (20:53 +0000)]
Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce

11 years agoAdd delete cascade for Accounts.
George Mount [Tue, 12 Mar 2013 20:13:21 +0000 (13:13 -0700)]
Add delete cascade for Accounts.

Change-Id: I962c7cb657643c3eddbbeb6a691b26de5553d4df

11 years agoam 1124090a: Fix ICS compatibility issues
John Reck [Tue, 12 Mar 2013 20:11:02 +0000 (13:11 -0700)]
am 1124090a: Fix ICS compatibility issues

* commit '1124090a300e96f6d1d5b0c67f3fe314daf32743':
  Fix ICS compatibility issues

11 years agoFix ICS compatibility issues
John Reck [Tue, 12 Mar 2013 19:55:27 +0000 (12:55 -0700)]
Fix ICS compatibility issues

Change-Id: I43f3236b9da0424fde66d3ad4d46403223fde8bf

11 years agoam f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce
Justin Koh [Tue, 12 Mar 2013 19:11:32 +0000 (12:11 -0700)]
am f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce

* commit 'f402ec180c7e5f406ee30075dc6dac7a90f9310e':
  Update Pano XML tag and permission.

11 years agoMerge "Update Pano XML tag and permission." into gb-ub-photos-bryce
Justin Koh [Tue, 12 Mar 2013 19:09:46 +0000 (19:09 +0000)]
Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 12 Mar 2013 18:51:07 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb...
George Mount [Tue, 12 Mar 2013 18:45:20 +0000 (11:45 -0700)]
am f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce

* commit 'f450fb6b2130998cf7ee7eb3b82074cb3b37b1a0':
  Add support for local storage of uploaded pictures.

11 years agoMerge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
George Mount [Tue, 12 Mar 2013 18:44:08 +0000 (18:44 +0000)]
Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce

11 years agoUpdate Pano XML tag and permission.
Justin Koh [Tue, 12 Mar 2013 17:49:04 +0000 (10:49 -0700)]
Update Pano XML tag and permission.

Update Pano XML tag and permission.
Bug: 8359058

Change-Id: I92626f03f5c6857951d5f17fb6f811ffbc24e74f

11 years agoam 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
Michael Kolb [Tue, 12 Mar 2013 17:47:53 +0000 (10:47 -0700)]
am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce

* commit '39d2192d8c93b40e19f047bbd2bef24a3e987e44':
  Open camera only once in Video module

11 years agoMerge "Open camera only once in Video module" into gb-ub-photos-bryce
Michael Kolb [Tue, 12 Mar 2013 17:46:42 +0000 (17:46 +0000)]
Merge "Open camera only once in Video module" into gb-ub-photos-bryce

11 years agoOpen camera only once in Video module
Michael Kolb [Tue, 12 Mar 2013 17:42:56 +0000 (10:42 -0700)]
Open camera only once in Video module

  Bug: 8272736

Change-Id: Id28fde5da62083651627dc8c734e818afe22a6e0

11 years agoam b6b5b5a3: Fix potential problem with default rsc number
nicolasroard [Tue, 12 Mar 2013 16:57:36 +0000 (09:57 -0700)]
am b6b5b5a3: Fix potential problem with default rsc number

* commit 'b6b5b5a357710b19236d64fb4ee4438724d763a8':
  Fix potential problem with default rsc number

11 years agoFix potential problem with default rsc number
nicolasroard [Tue, 12 Mar 2013 15:46:15 +0000 (08:46 -0700)]
Fix potential problem with default rsc number

Change-Id: I8205dbb2488232084f984a10963bb9286ff19e0e

11 years agoam b2fcd425: Fix layout on phones
nicolasroard [Tue, 12 Mar 2013 15:44:05 +0000 (08:44 -0700)]
am b2fcd425: Fix layout on phones

* commit 'b2fcd4252cbcee124e68412bb53a8b875ce9ba36':
  Fix layout on phones

11 years agoAdd support for local storage of uploaded pictures.
George Mount [Mon, 11 Mar 2013 19:58:46 +0000 (12:58 -0700)]
Add support for local storage of uploaded pictures.

Change-Id: I23c86e6a95871effcb76a54b16b9ab7720a63383

11 years agoFix layout on phones
nicolasroard [Tue, 12 Mar 2013 04:04:30 +0000 (21:04 -0700)]
Fix layout on phones

Change-Id: I147b00f1abf032877c7461138ec78149bfd8b519

11 years agoam 8d2c7ee0: Various bugfixes/improvements for Fx Filters: - fix bug in history with...
nicolasroard [Tue, 12 Mar 2013 03:47:54 +0000 (20:47 -0700)]
am 8d2c7ee0: Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don\'t load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps

* commit '8d2c7ee02c8fde53effc787c172b10b14ae34d42':
  Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps

11 years agoVarious bugfixes/improvements for Fx Filters:
nicolasroard [Tue, 12 Mar 2013 02:16:03 +0000 (19:16 -0700)]
Various bugfixes/improvements for Fx Filters:
- fix bug in history with Fx filters
- don't load Fx bitmaps at startup
- free bitmaps when unneeded
- fix history preview bitmaps

Change-Id: I5631a5bcec12c121871b3575066c201486896a14

11 years agoam 001283a7: fix menus for all editors
John Hoford [Tue, 12 Mar 2013 00:58:02 +0000 (17:58 -0700)]
am 001283a7: fix menus for all editors

* commit '001283a72d451999e3308f45dc365d4defc0af39':
  fix menus for all editors

11 years agofix menus for all editors
John Hoford [Mon, 11 Mar 2013 22:08:26 +0000 (15:08 -0700)]
fix menus for all editors

Change-Id: I93e7eef3176b38480d55df176166646709a875fe

11 years agoam dc32aaf9: Enable operations on accounts table.
Mangesh Ghiware [Mon, 11 Mar 2013 22:52:19 +0000 (15:52 -0700)]
am dc32aaf9: Enable operations on accounts table.

* commit 'dc32aaf95fd6925796474688c24704b3265a1ae7':
  Enable operations on accounts table.

11 years agoEnable operations on accounts table.
Mangesh Ghiware [Mon, 11 Mar 2013 22:44:56 +0000 (15:44 -0700)]
Enable operations on accounts table.

Change-Id: Ida0e379cad422dbeffb3b4ea89232db7f45a36e4

11 years agoam 54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce
Michael Kolb [Mon, 11 Mar 2013 22:36:03 +0000 (15:36 -0700)]
am 54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce

* commit '54c1256ffd0f578f4b33680c54d50ab6901d9098':
  Spring cleaning

11 years agoam 6f3ff5b4: split filter show into multiple files
John Hoford [Mon, 11 Mar 2013 22:36:02 +0000 (15:36 -0700)]
am 6f3ff5b4: split filter show into multiple files

* commit '6f3ff5b486e30221361afd066510a7374962fd09':
  split filter show into multiple files

11 years agoMerge "Spring cleaning" into gb-ub-photos-bryce
Michael Kolb [Mon, 11 Mar 2013 22:35:00 +0000 (22:35 +0000)]
Merge "Spring cleaning" into gb-ub-photos-bryce

11 years agosplit filter show into multiple files
John Hoford [Mon, 11 Mar 2013 22:08:26 +0000 (15:08 -0700)]
split filter show into multiple files

Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535

11 years agoSpring cleaning
Michael Kolb [Sat, 9 Mar 2013 04:43:01 +0000 (20:43 -0800)]
Spring cleaning

Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a

11 years agoam 6a07dfbe: refactoring to make Editor classes do more
John Hoford [Mon, 11 Mar 2013 21:39:33 +0000 (14:39 -0700)]
am 6a07dfbe: refactoring to make Editor classes do more

* commit '6a07dfbe03c8396cc43840a1630ea480a2cff663':
  refactoring to make Editor classes do more

11 years agorefactoring to make Editor classes do more
John Hoford [Mon, 11 Mar 2013 18:10:22 +0000 (11:10 -0700)]
refactoring to make Editor classes do more

Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9

11 years agoam 009b0502: am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours...
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:07:32 +0000 (13:07 -0700)]
am 009b0502: am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '009b05028ced67523e257a2abbdc5c07776f0ceb':

11 years agoam 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile...
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:46 +0000 (13:00 -0700)]
am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63e1a5a9076f90e9e704e06956ba414a1d28c6a3':

11 years agoam de175c80: Don\'t record video before preview is started
Michael Kolb [Mon, 11 Mar 2013 20:00:00 +0000 (13:00 -0700)]
am de175c80: Don\'t record video before preview is started

* commit 'de175c806c524e08b4ca7c6ec991a5610c3856d9':
  Don't record video before preview is started

11 years agoam 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:56:10 +0000 (12:56 -0700)]
am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4c13ac4382d3bde4eb8b3c448a8ee6cb05a541d0':

11 years agoDon't record video before preview is started
Michael Kolb [Mon, 11 Mar 2013 19:37:40 +0000 (12:37 -0700)]
Don't record video before preview is started

  Bug: 8358998

Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a

11 years agoam 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:55 +0000 (12:41 -0700)]
am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '73d8e5d2652b7fd50361d4fc4542140c62591404':

11 years agoam 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:27:37 +0000 (12:27 -0700)]
am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63da0db6333796d7b3a94af55de58039cea94b8d':

11 years agoReconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:21:38 +0000 (12:21 -0700)]
Reconcile with jb-mr1-release - do not merge

11 years agoam f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor.
Ruben Brunk [Mon, 11 Mar 2013 19:14:41 +0000 (12:14 -0700)]
am f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor.

* commit 'f07bb27436a65b233c1caf4aa06c6257a9cf4046':
  Clear Gallery's bitmap pool before starting photoeditor.

11 years agoClear Gallery's bitmap pool before starting photoeditor.
Ruben Brunk [Mon, 11 Mar 2013 19:00:06 +0000 (12:00 -0700)]
Clear Gallery's bitmap pool before starting photoeditor.

Change-Id: Iaa1f559db12ba22e53673b2e9fe2c3fbabf33514

11 years agoam 5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start. ...
Ruben Brunk [Mon, 11 Mar 2013 18:45:08 +0000 (11:45 -0700)]
am 5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start.  Minor refactoring."" into gb-ub-photos-bryce

* commit '5a17cc93c3a34f0494eaa38353c0ac727086222d':
  Revert "Clear Gallery's bitmap pool on photo editor start.  Minor refactoring."

11 years agoMerge "Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring...
Ruben Brunk [Mon, 11 Mar 2013 18:42:41 +0000 (18:42 +0000)]
Merge "Revert "Clear Gallery's bitmap pool on photo editor start.  Minor refactoring."" into gb-ub-photos-bryce

11 years agoRevert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
Ruben Brunk [Mon, 11 Mar 2013 18:41:39 +0000 (18:41 +0000)]
Revert "Clear Gallery's bitmap pool on photo editor start.  Minor refactoring."

This reverts commit 65948b17607d6fab9a2561749a90e16889fd1eea

Change-Id: Iea682767fced173fe56dd6e91244f0ef70d1f74b

11 years agoam 9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start. Minor refact...
Ruben Brunk [Mon, 11 Mar 2013 18:38:59 +0000 (11:38 -0700)]
am 9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start.  Minor refactoring." into gb-ub-photos-bryce

* commit '9ecbf66d54204f78e9b51bee6f76d2bde1dc6882':
  Clear Gallery's bitmap pool on photo editor start.  Minor refactoring.

11 years agoMerge "Clear Gallery's bitmap pool on photo editor start. Minor refactoring." into...
Ruben Brunk [Mon, 11 Mar 2013 18:37:55 +0000 (18:37 +0000)]
Merge "Clear Gallery's bitmap pool on photo editor start.  Minor refactoring." into gb-ub-photos-bryce

11 years agoClear Gallery's bitmap pool on photo editor start. Minor refactoring.
Ruben Brunk [Mon, 11 Mar 2013 16:53:16 +0000 (09:53 -0700)]
Clear Gallery's bitmap pool on photo editor start.  Minor refactoring.

Change-Id: I02e29bf6cfd85a9cecd3850f8828cccae91badd2

11 years agoam 6019ad95: Add tiled background
nicolasroard [Mon, 11 Mar 2013 17:39:40 +0000 (10:39 -0700)]
am 6019ad95: Add tiled background

* commit '6019ad95f1c85786488d2d4cae1cbb665d33bd30':
  Add tiled background

11 years agoAdd tiled background
nicolasroard [Sat, 9 Mar 2013 19:18:43 +0000 (11:18 -0800)]
Add tiled background

Change-Id: I52292f6cae4f1121795829663dc4738cb38a953b

11 years agoam 402dd963: Clear border resources to save memory
nicolasroard [Sat, 9 Mar 2013 18:15:25 +0000 (10:15 -0800)]
am 402dd963: Clear border resources to save memory

* commit '402dd963ad8fb1dfed81cca63cbaf82e93533a94':
  Clear border resources to save memory

11 years agoClear border resources to save memory
nicolasroard [Sat, 9 Mar 2013 18:06:49 +0000 (10:06 -0800)]
Clear border resources to save memory

Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2

11 years agoam 259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resou...
nicolasroard [Sat, 9 Mar 2013 01:32:36 +0000 (17:32 -0800)]
am 259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce

* commit '259bb0f4a960d87bc0d3fa7d3b9f626bf1f16d0c':
  Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup