OSDN Git Service
George Mount [Mon, 18 Mar 2013 18:35:51 +0000 (11:35 -0700)]
am
42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
* commit '
42559630d746e79fb139c65b2b12a35742eb0354':
Fix "drop table" problem.
George Mount [Mon, 18 Mar 2013 18:33:42 +0000 (18:33 +0000)]
Merge "Fix "drop table" problem." into gb-ub-photos-bryce
Angus Kong [Mon, 18 Mar 2013 18:28:45 +0000 (11:28 -0700)]
am
dc798933: Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce
* commit '
dc7989333319d5042c112805d4244aeeec41e9d7':
Add shared preference key of LightCycle.
Angus Kong [Mon, 18 Mar 2013 18:27:50 +0000 (18:27 +0000)]
Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 17:05:55 +0000 (10:05 -0700)]
Fix "drop table" problem.
Bug
8404285
Should drop table if exists when upgrading, not just drop a table.
Change-Id: Ic75fa0efc6ab44be073b2b78a8520e2289cd3148
nicolasroard [Sun, 17 Mar 2013 16:18:52 +0000 (09:18 -0700)]
nicolasroard [Sun, 17 Mar 2013 16:18:51 +0000 (09:18 -0700)]
am
38ac5c3e: Merge "Add new slider style" into gb-ub-photos-bryce
* commit '
38ac5c3eab22ac051859b8eda40cfa5ceb675d53':
Add new slider style
nicolasroard [Sat, 16 Mar 2013 02:16:16 +0000 (19:16 -0700)]
Fix xmp crash
Change-Id: I256062b19e540fa77ff982552e62977789caf29b
nicolasroard [Sat, 16 Mar 2013 02:10:59 +0000 (02:10 +0000)]
Merge "Add new slider style" into gb-ub-photos-bryce
nicolasroard [Sat, 16 Mar 2013 01:15:44 +0000 (18:15 -0700)]
Add new slider style
Change-Id: I3c749058b6432765b5c8d8d39d26dc4467437ddf
Angus Kong [Sat, 16 Mar 2013 00:32:59 +0000 (17:32 -0700)]
Add shared preference key of LightCycle.
Change-Id: Ifd3171502cfde321769e3bc2b554ec14bf7bdd21
Ruben Brunk [Sat, 16 Mar 2013 01:04:11 +0000 (18:04 -0700)]
am
7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce
* commit '
7dc5b6b32d566d47a70ef32d93057a3fcf7524c9':
Refactoring iconbutton.
Ruben Brunk [Sat, 16 Mar 2013 01:02:48 +0000 (01:02 +0000)]
Merge "Refactoring iconbutton." into gb-ub-photos-bryce
Ruben Brunk [Fri, 15 Mar 2013 22:33:38 +0000 (15:33 -0700)]
Refactoring iconbutton.
Change-Id: Ie1538d978605ae28bb4fa6779eb2802794a35312
Bobby Georgescu [Fri, 15 Mar 2013 22:57:28 +0000 (15:57 -0700)]
am
9674c47d: Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce
* commit '
9674c47ddc19351379888f0bc221190e8e05122b':
Improve AlbumSet UI in new gallery
Bobby Georgescu [Fri, 15 Mar 2013 22:56:03 +0000 (22:56 +0000)]
Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 15 Mar 2013 21:38:04 +0000 (14:38 -0700)]
Improve AlbumSet UI in new gallery
Change-Id: I31cbf7cf8c0c7b5f5f3413a59ad94142b13870d2
John Reck [Fri, 15 Mar 2013 20:28:17 +0000 (13:28 -0700)]
am
ad0a874d: Prepare to switch to panolibs
* commit '
ad0a874d0383106a412d22138ebec6b51a13d88e':
Prepare to switch to panolibs
John Reck [Fri, 15 Mar 2013 20:19:30 +0000 (13:19 -0700)]
Prepare to switch to panolibs
Change-Id: Ie29c0014fcb08105cab1ee6043f66b58e5ac85f8
George Mount [Fri, 15 Mar 2013 20:10:50 +0000 (13:10 -0700)]
am
b5ab491c: Delete and recreate database on upgrade.
* commit '
b5ab491c5461df7fedb9c83f42e80acef4fd8a8e':
Delete and recreate database on upgrade.
George Mount [Fri, 15 Mar 2013 18:16:08 +0000 (11:16 -0700)]
Delete and recreate database on upgrade.
Change-Id: I0125697dd673568ddfee7be8d7d0d693018b61d5
George Mount [Fri, 15 Mar 2013 15:42:07 +0000 (08:42 -0700)]
am
091314b7: Use cancellationSignal only on API Level 16 and above.
* commit '
091314b7ea73e774ce96c981bd7007c94ad80e30':
Use cancellationSignal only on API Level 16 and above.
George Mount [Fri, 15 Mar 2013 14:52:15 +0000 (07:52 -0700)]
Use cancellationSignal only on API Level 16 and above.
Bug
8390238
Change-Id: If2dacb1eb74e531d004b6f281d32a81f7cd59139
nicolasroard [Fri, 15 Mar 2013 04:32:42 +0000 (21:32 -0700)]
am
a2729a16: Fix layout issue on rotation
* commit '
a2729a16717ec0e7bdaf8fa112d7a1d1760ba2e3':
Fix layout issue on rotation
nicolasroard [Fri, 15 Mar 2013 01:47:25 +0000 (18:47 -0700)]
Fix layout issue on rotation
Change-Id: I93956687c5c4332c3ceae6f1e3c7041fb322b041
Ruben Brunk [Fri, 15 Mar 2013 01:44:36 +0000 (18:44 -0700)]
am
0ca39072: Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce
* commit '
0ca39072098a16da35fbe95f91892eca3d6aa077':
Fixed more threading bugs in the ImageFilterRS and the FiltersManager.
Ruben Brunk [Fri, 15 Mar 2013 01:43:20 +0000 (01:43 +0000)]
Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce
nicolasroard [Fri, 15 Mar 2013 01:39:27 +0000 (18:39 -0700)]
am
253b0816: Enable touch panning by default
* commit '
253b0816b2e979a1e4fef1d99df3345483580655':
Enable touch panning by default
Ruben Brunk [Fri, 15 Mar 2013 01:04:15 +0000 (18:04 -0700)]
Fixed more threading bugs in the ImageFilterRS and the FiltersManager.
Bug:
8392832
Change-Id: I87b3af9ddb62524f02858a82eac2cc3bd2209418
nicolasroard [Fri, 15 Mar 2013 01:23:53 +0000 (18:23 -0700)]
Enable touch panning by default
Change-Id: I7d0ced296fe84c2cfff820fbcb99f5731f9ade44
Bobby Georgescu [Thu, 14 Mar 2013 23:19:04 +0000 (16:19 -0700)]
am
8d3031b3: Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce
* commit '
8d3031b3b2f7c74d9677f72a2979b43766a677de':
Add many contextual actions to new gallery
Bobby Georgescu [Thu, 14 Mar 2013 23:17:41 +0000 (23:17 +0000)]
Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce
Ruben Brunk [Thu, 14 Mar 2013 23:08:54 +0000 (16:08 -0700)]
am
987bd62f: Merge "Requested RS method rename." into gb-ub-photos-bryce
* commit '
987bd62fda1decf793657e533408a4e74ad1cf22':
Requested RS method rename.
Ruben Brunk [Thu, 14 Mar 2013 23:07:59 +0000 (23:07 +0000)]
Merge "Requested RS method rename." into gb-ub-photos-bryce
Bobby Georgescu [Thu, 14 Mar 2013 22:19:23 +0000 (15:19 -0700)]
Add many contextual actions to new gallery
Change-Id: Ied57636c7bf0804ad015ddc664e177633c549e08
Ruben Brunk [Thu, 14 Mar 2013 22:13:12 +0000 (15:13 -0700)]
Requested RS method rename.
Change-Id: I2f158cb6cfb6ab23907e49c89f93681692e56dfb
Michael Kolb [Thu, 14 Mar 2013 22:11:30 +0000 (15:11 -0700)]
am
0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce
* commit '
0198d64d86ad05e72c2459ae1055f482d30b5305':
Fix exposure compensation
Michael Kolb [Thu, 14 Mar 2013 22:09:15 +0000 (22:09 +0000)]
Merge "Fix exposure compensation" into gb-ub-photos-bryce
Michael Kolb [Thu, 14 Mar 2013 22:06:51 +0000 (15:06 -0700)]
Fix exposure compensation
Bug:
8391082
Change-Id: I346b57dd0c1ed240ab4daa61147c2dd8f8892b44
Justin Koh [Thu, 14 Mar 2013 21:54:20 +0000 (14:54 -0700)]
am
4a204853: Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce
* commit '
4a204853b57a6e855b0f4c2179d41bebce591ea7':
Update Gallery Pano Provider.
Justin Koh [Thu, 14 Mar 2013 21:52:48 +0000 (21:52 +0000)]
Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce
Justin Koh [Thu, 14 Mar 2013 21:28:29 +0000 (14:28 -0700)]
Update Gallery Pano Provider.
Update Gallery Pano Provider. Use DIP instead of PX.
Change-Id: I8871502aa215012a8647401f7ee1e7906e110fe4
Tim Murray [Thu, 14 Mar 2013 21:22:01 +0000 (14:22 -0700)]
am
fdb2fbc7: Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce
* commit '
fdb2fbc75750869dacb5e61779e00d93b25aed8e':
Change element type to A_8 to support sampling.
Tim Murray [Thu, 14 Mar 2013 21:19:52 +0000 (21:19 +0000)]
Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce
Ruben Brunk [Thu, 14 Mar 2013 21:07:48 +0000 (14:07 -0700)]
am
6cdae525: Merge "Fix image icons on Razr M." into gb-ub-photos-bryce
* commit '
6cdae525a4c602860b464823685b7b6ac0298abc':
Fix image icons on Razr M.
Ruben Brunk [Thu, 14 Mar 2013 21:06:08 +0000 (21:06 +0000)]
Merge "Fix image icons on Razr M." into gb-ub-photos-bryce
Ruben Brunk [Thu, 14 Mar 2013 20:47:51 +0000 (13:47 -0700)]
Fix image icons on Razr M.
Change-Id: I9f47dd043055fb5dc25dda643a3e9c81356bd0d5
Tim Murray [Thu, 14 Mar 2013 20:56:39 +0000 (13:56 -0700)]
Change element type to A_8 to support sampling.
Change-Id: Ib91c924c9c2966bf431e24519af8ade7e360cf88
Mangesh Ghiware [Thu, 14 Mar 2013 19:34:11 +0000 (12:34 -0700)]
am
693a5b7a: Use plurals for table names for consistency.
* commit '
693a5b7a18066d4757d49a44214356a3dd9f61a0':
Use plurals for table names for consistency.
Mangesh Ghiware [Thu, 14 Mar 2013 17:27:04 +0000 (10:27 -0700)]
Use plurals for table names for consistency.
Change-Id: I663c0085ed467f3f61f6060147374d9128967e2d
nicolasroard [Thu, 14 Mar 2013 16:16:48 +0000 (09:16 -0700)]
am
978f4aae: Fix for crash upon saving image
* commit '
978f4aae1d2923fd125f85a6d5c568a26c571522':
Fix for crash upon saving image
nicolasroard [Thu, 14 Mar 2013 15:58:24 +0000 (08:58 -0700)]
Fix for crash upon saving image
Change-Id: I305626a61a07d2290e7d5600da4c26f2a82ab1c9
Baligh Uddin [Thu, 14 Mar 2013 04:50:39 +0000 (21:50 -0700)]
am
0dc23631: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
0dc236310352422e27ce5f045d4fc4d27163b08e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Mar 2013 04:48:40 +0000 (04:48 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 14 Mar 2013 04:48:22 +0000 (04:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
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.
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
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
John Hoford [Thu, 14 Mar 2013 03:23:28 +0000 (03:23 +0000)]
Merge "add icon to indicate menu" into gb-ub-photos-bryce
John Hoford [Thu, 14 Mar 2013 03:17:43 +0000 (20:17 -0700)]
add icon to indicate menu
Change-Id: I3327751cd78dd9b654e51e99a6756967c6fb82f5
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
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
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
Ruben Brunk [Thu, 14 Mar 2013 01:07:47 +0000 (18:07 -0700)]
am
6e6a5243: Exif parser modifications.
* commit '
6e6a524390d8ddebce5de0dcc8ae258e652ec80a':
Exif parser modifications.
Ruben Brunk [Tue, 12 Mar 2013 02:00:12 +0000 (19:00 -0700)]
Exif parser modifications.
Bug:
8018327
Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
Doris Liu [Wed, 13 Mar 2013 02:24:28 +0000 (19:24 -0700)]
Use Model-View-Controller pattern on video module
Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa
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
Bobby Georgescu [Wed, 13 Mar 2013 22:12:24 +0000 (22:12 +0000)]
Merge "size tweak" into gb-ub-photos-bryce
John Reck [Wed, 13 Mar 2013 22:11:14 +0000 (15:11 -0700)]
size tweak
Change-Id: I2153774ef05f67b313f86c4552ccd0471fae1f6e
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.
Angus Kong [Wed, 13 Mar 2013 21:39:32 +0000 (21:39 +0000)]
Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
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
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
Angus Kong [Fri, 22 Feb 2013 22:02:25 +0000 (14:02 -0800)]
Horizontal scrollable filmstrip view.
Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
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
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
Bobby Georgescu [Sat, 9 Mar 2013 04:15:15 +0000 (20:15 -0800)]
Sharing support for albums, bulk operations infrastructure
Change-Id: I590f60ab85ffbd9cf9d7cd9982627604fa1b427f
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
Michael Kolb [Wed, 13 Mar 2013 21:00:41 +0000 (21:00 +0000)]
Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
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.
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
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
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
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
Michael Kolb [Wed, 13 Mar 2013 17:50:24 +0000 (17:50 +0000)]
Merge "Fix Monkey NPE" into gb-ub-photos-bryce
Michael Kolb [Wed, 13 Mar 2013 17:47:06 +0000 (10:47 -0700)]
Fix Monkey NPE
Bug:
8377895
Change-Id: Iaa89330e8c69961d700e0aab91d7855d579874f0
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
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
Bobby Georgescu [Wed, 13 Mar 2013 05:45:17 +0000 (22:45 -0700)]
Usage statistics collection for camera module, filmstrip
Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
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
nicolasroard [Wed, 13 Mar 2013 01:38:27 +0000 (01:38 +0000)]
Merge "Fix preview synchronization" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Mar 2013 01:23:41 +0000 (18:23 -0700)]
Fix preview synchronization
Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04
John Reck [Wed, 13 Mar 2013 00:24:21 +0000 (17:24 -0700)]
John Reck [Wed, 13 Mar 2013 00:22:48 +0000 (17:22 -0700)]
fix build
Change-Id: I41898041ad2e6d59973af30680288c436f3c6357
John Reck [Wed, 13 Mar 2013 00:02:10 +0000 (17:02 -0700)]
am
2f205d54: basic activated support
* commit '
2f205d54c88ea3f6b1a1a0630201fdb10b0689e2':
basic activated support
John Reck [Wed, 13 Mar 2013 00:02:09 +0000 (17:02 -0700)]
John Reck [Tue, 12 Mar 2013 23:11:18 +0000 (16:11 -0700)]
basic activated support
Change-Id: If1c1faf42311ddbc76b617bff5f3c6bdafdef5d1
John Reck [Tue, 12 Mar 2013 20:46:33 +0000 (13:46 -0700)]
Use viewpager
Change-Id: Icd320799ce1e13815e34b2a0e45a9f6a47736de3
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
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
OSDN Git Service
