OSDN Git Service
Bobby Georgescu [Thu, 14 Mar 2013 02:43:44 +0000 (02:43 +0000)]
am
bf2799fe: am
737cf7c6: am
bb0ce1c2: am
730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
* commit '
bf2799fe893a57994462020042a55acafbb608a1':
Add coarse grained events for camera mode, filmstrip stats
Michael Kolb [Thu, 14 Mar 2013 02:43:44 +0000 (02:43 +0000)]
am
b3ed2d66: am
9e8d7539: am
3b1c48ee: am
d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
* commit '
b3ed2d664e9226994fea766342637c2606e9da8e':
Fix bug in exposure setting
Ruben Brunk [Thu, 14 Mar 2013 02:43:43 +0000 (02:43 +0000)]
am
225ecd83: am
75b6a0b7: am
70f9e167: am
4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce
* commit '
225ecd832da9d8ebe4fdc05c3e22586c36d7ec76':
Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
Michael Kolb [Thu, 14 Mar 2013 02:43:42 +0000 (02:43 +0000)]
am
c8fae92c: am
e128208b: am
cb029f20: am
d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce
* commit '
c8fae92c821d8ffb212a9d39cac1435c60799f04':
Fix Monkey NPE
Bobby Georgescu [Thu, 14 Mar 2013 02:43:42 +0000 (02:43 +0000)]
am
7dff559d: am
6157620b: am
f62d137e: am
f37648b8: Usage statistics collection for camera module, filmstrip
* commit '
7dff559d1734cb10b221c828ba2b610c340b3cf6':
Usage statistics collection for camera module, filmstrip
Bobby Georgescu [Thu, 14 Mar 2013 02:34:01 +0000 (02:34 +0000)]
am
737cf7c6: am
bb0ce1c2: am
730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
* commit '
737cf7c68f3b6431722390b3480dfe76b313e1ee':
Add coarse grained events for camera mode, filmstrip stats
Michael Kolb [Thu, 14 Mar 2013 02:33:57 +0000 (02:33 +0000)]
am
9e8d7539: am
3b1c48ee: am
d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
* commit '
9e8d7539e754f28b1934007431d8b3f34e9cb5fa':
Fix bug in exposure setting
Ruben Brunk [Thu, 14 Mar 2013 02:33:56 +0000 (02:33 +0000)]
am
75b6a0b7: am
70f9e167: am
4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce
* commit '
75b6a0b727911e3aa9c642629ffaea96b805405f':
Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
Michael Kolb [Thu, 14 Mar 2013 02:33:51 +0000 (02:33 +0000)]
am
e128208b: am
cb029f20: am
d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce
* commit '
e128208b4705a81d10281dd4a2f637aca6cc642e':
Fix Monkey NPE
Bobby Georgescu [Thu, 14 Mar 2013 02:33:43 +0000 (02:33 +0000)]
am
6157620b: am
f62d137e: am
f37648b8: Usage statistics collection for camera module, filmstrip
* commit '
6157620bf3e24d5db0eb8bd102611bbaae72242c':
Usage statistics collection for camera module, filmstrip
Bobby Georgescu [Wed, 13 Mar 2013 21:26:14 +0000 (21:26 +0000)]
am
bb0ce1c2: am
730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
* commit '
bb0ce1c2e6642e7289dc80ff495d4993787dc486':
Add coarse grained events for camera mode, filmstrip stats
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
Michael Kolb [Wed, 13 Mar 2013 21:07:56 +0000 (21:07 +0000)]
am
3b1c48ee: am
d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
* commit '
3b1c48ee7f0f06fcebcb39fccffc322e1a386e80':
Fix bug in exposure setting
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
Ruben Brunk [Wed, 13 Mar 2013 21:04:38 +0000 (21:04 +0000)]
am
70f9e167: am
4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce
* commit '
70f9e167c7cda54dfa1e47ff263b37ef68975f36':
Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
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:54:35 +0000 (17:54 +0000)]
am
cb029f20: am
d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce
* commit '
cb029f209225f8927ea150ff7a2b64855e936ddf':
Fix Monkey NPE
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:25:34 +0000 (16:25 +0000)]
am
f62d137e: am
f37648b8: Usage statistics collection for camera module, filmstrip
* commit '
f62d137ede8ede46bd19ecec3d32bd733673982c':
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
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:43:59 +0000 (01:43 +0000)]
am
9f4b4b4d: am
1e2f3686: am
6067d17e: am
e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce
* commit '
9f4b4b4d1507ef8a64911acb5bab9c70f9f990d0':
Fix preview synchronization
nicolasroard [Wed, 13 Mar 2013 01:42:09 +0000 (01:42 +0000)]
am
1e2f3686: am
6067d17e: am
e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce
* commit '
1e2f368694fc6fb774877a0cf1e18e12302175da':
Fix preview synchronization
nicolasroard [Wed, 13 Mar 2013 01:41:02 +0000 (01:41 +0000)]
am
6067d17e: am
e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce
* commit '
6067d17efa6f6db8ad5c61381f513d288c7881b9':
Fix preview synchronization
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:31:48 +0000 (00:31 +0000)]
John Reck [Wed, 13 Mar 2013 00:30:25 +0000 (00:30 +0000)]
John Reck [Wed, 13 Mar 2013 00:28:33 +0000 (00:28 +0000)]
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:09:59 +0000 (00:09 +0000)]
am
2a8d5768: am
8aecae62: am
86b531ea: am
2f205d54: basic activated support
* commit '
2a8d57687a0b39d54d2b220a9296a26e5e7410ff':
basic activated support
John Reck [Wed, 13 Mar 2013 00:09:58 +0000 (00:09 +0000)]
John Reck [Wed, 13 Mar 2013 00:08:16 +0000 (00:08 +0000)]
am
8aecae62: am
86b531ea: am
2f205d54: basic activated support
* commit '
8aecae62543dc2e16665b85ccd3d69c22e249e1b':
basic activated support
John Reck [Wed, 13 Mar 2013 00:08:15 +0000 (00:08 +0000)]
John Reck [Wed, 13 Mar 2013 00:06:08 +0000 (00:06 +0000)]
am
86b531ea: am
2f205d54: basic activated support
* commit '
86b531ea2b8ebf2e11cab85d48e0f893ab618137':
basic activated support
John Reck [Wed, 13 Mar 2013 00:06:07 +0000 (00:06 +0000)]
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:58:17 +0000 (22:58 +0000)]
am
70a19833: am
d2c82e0f: am
300b9697: am
9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce
* commit '
70a19833e0eedde220c375656beeb58d843a681f':
Add loading resources helper functions to ImageFilterRS
nicolasroard [Tue, 12 Mar 2013 22:55:13 +0000 (22:55 +0000)]
am
d2c82e0f: am
300b9697: am
9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce
* commit '
d2c82e0fd112f57c1b0a40dda60925afc82438b0':
Add loading resources helper functions to ImageFilterRS
nicolasroard [Tue, 12 Mar 2013 22:53:05 +0000 (22:53 +0000)]
am
300b9697: am
9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce
* commit '
300b9697d5b246dc7d2c6e011908b2a9c7d06240':
Add loading resources helper functions to ImageFilterRS
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
nicolasroard [Tue, 12 Mar 2013 21:30:33 +0000 (14:30 -0700)]
Add loading resources helper functions to ImageFilterRS
Change-Id: I79b4996b5da0fa05536f2f53f770d01e9735b96c
George Mount [Tue, 12 Mar 2013 21:03:05 +0000 (21:03 +0000)]
am
6d557f7f: am
657ddfa9: am
d2730296: am
b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
* commit '
6d557f7fa56c588326a9eaa193965a805be3b0c8':
Add delete cascade for Accounts.
George Mount [Tue, 12 Mar 2013 21:01:42 +0000 (21:01 +0000)]
am
657ddfa9: am
d2730296: am
b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
* commit '
657ddfa95f712c1f2da5d9d4fb5af90aa497edce':
Add delete cascade for Accounts.
George Mount [Tue, 12 Mar 2013 20:59:02 +0000 (20:59 +0000)]
am
d2730296: am
b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
* commit '
d2730296cd0f1c62796c606204d38622a8273228':
Add delete cascade for Accounts.
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.
George Mount [Tue, 12 Mar 2013 20:53:21 +0000 (20:53 +0000)]
Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
George Mount [Tue, 12 Mar 2013 20:13:21 +0000 (13:13 -0700)]
Add delete cascade for Accounts.
Change-Id: I962c7cb657643c3eddbbeb6a691b26de5553d4df
John Reck [Tue, 12 Mar 2013 20:15:30 +0000 (20:15 +0000)]
am
1aa34c7b: am
ff6ae394: am
5ec22bd8: am
1124090a: Fix ICS compatibility issues
* commit '
1aa34c7bac0e1feb7d3d34669498b8c361f30813':
Fix ICS compatibility issues
John Reck [Tue, 12 Mar 2013 20:14:10 +0000 (20:14 +0000)]
am
ff6ae394: am
5ec22bd8: am
1124090a: Fix ICS compatibility issues
* commit '
ff6ae394828a5d043ee7fc15965ce0d6a16096d8':
Fix ICS compatibility issues
John Reck [Tue, 12 Mar 2013 20:12:37 +0000 (20:12 +0000)]
am
5ec22bd8: am
1124090a: Fix ICS compatibility issues
* commit '
5ec22bd839dd7c0ba7fde6ab3c4e39205dd659d6':
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
John Reck [Tue, 12 Mar 2013 19:55:27 +0000 (12:55 -0700)]
Fix ICS compatibility issues
Change-Id: I43f3236b9da0424fde66d3ad4d46403223fde8bf
Justin Koh [Tue, 12 Mar 2013 19:16:38 +0000 (19:16 +0000)]
am
4dadfa9d: am
a043b351: am
8384597d: am
f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce
* commit '
4dadfa9d277526748171976cb2e75cf188b1c305':
Update Pano XML tag and permission.
Justin Koh [Tue, 12 Mar 2013 19:13:58 +0000 (19:13 +0000)]
am
a043b351: am
8384597d: am
f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce
* commit '
a043b351bdbe46ba21a520b5d4dc05c202bff6dd':
Update Pano XML tag and permission.
Justin Koh [Tue, 12 Mar 2013 19:12:31 +0000 (19:12 +0000)]
am
8384597d: am
f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce
* commit '
8384597dc2253d49da0e716a9e85f7fa778f403e':
Update Pano XML tag and permission.
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.
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
George Mount [Tue, 12 Mar 2013 18:52:42 +0000 (18:52 +0000)]
am
25e17de6: am
4891dde8: am
efc4f7dc: am
f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
* commit '
25e17de6ec553905ba768a83d94d57e8ca4ee31b':
Add support for local storage of uploaded pictures.
George Mount [Tue, 12 Mar 2013 18:50:43 +0000 (18:50 +0000)]
am
4891dde8: am
efc4f7dc: am
f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
* commit '
4891dde8597316b2c9828de569f60f8f555cdf3d':
Add support for local storage of uploaded pictures.
George Mount [Tue, 12 Mar 2013 18:49:23 +0000 (18:49 +0000)]
am
efc4f7dc: am
f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
* commit '
efc4f7dc3afb9211818f0cac6e702b49bc41336a':
Add support for local storage of uploaded pictures.
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.
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
Michael Kolb [Tue, 12 Mar 2013 17:52:06 +0000 (17:52 +0000)]
am
5293d521: am
7a0e735e: am
f3ca5b80: am
39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
* commit '
5293d521a855f9ef097739f74b6a7a628d518fc7':
Open camera only once in Video module
Michael Kolb [Tue, 12 Mar 2013 17:50:18 +0000 (17:50 +0000)]
am
7a0e735e: am
f3ca5b80: am
39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
* commit '
7a0e735e0afc116a6cd7a3b78da5d73d9af3aeff':
Open camera only once in Video module
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
Michael Kolb [Tue, 12 Mar 2013 17:49:00 +0000 (17:49 +0000)]
am
f3ca5b80: am
39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
* commit '
f3ca5b80749966e3c39336e9cfb5b76f1496204d':
Open camera only once in Video module
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
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
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
nicolasroard [Tue, 12 Mar 2013 17:04:32 +0000 (17:04 +0000)]
am
a4c0d489: am
809d801b: am
30ba8145: am
b6b5b5a3: Fix potential problem with default rsc number
* commit '
a4c0d489f6df684b0e205cf045cc42a2119769ee':
Fix potential problem with default rsc number
nicolasroard [Tue, 12 Mar 2013 17:02:35 +0000 (17:02 +0000)]
am
809d801b: am
30ba8145: am
b6b5b5a3: Fix potential problem with default rsc number
* commit '
809d801bcb3d9b47fd3a2751820c7e14d34e136d':
Fix potential problem with default rsc number
nicolasroard [Tue, 12 Mar 2013 16:59:59 +0000 (16:59 +0000)]
am
30ba8145: am
b6b5b5a3: Fix potential problem with default rsc number
* commit '
30ba81452a1d70b3c1697548337ecd6a3419fd5a':
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
nicolasroard [Tue, 12 Mar 2013 15:50:07 +0000 (15:50 +0000)]
am
c1390606: am
5be99e68: am
a3f5378b: am
b2fcd425: Fix layout on phones
* commit '
c139060603bae1ebbf242c3a12f3d7375628ccce':
Fix layout on phones
nicolasroard [Tue, 12 Mar 2013 15:48:16 +0000 (15:48 +0000)]
am
5be99e68: am
a3f5378b: am
b2fcd425: Fix layout on phones
* commit '
5be99e6856fe7dc92bdd4a5e6764b093d635516c':
Fix layout on phones
nicolasroard [Tue, 12 Mar 2013 15:46:15 +0000 (08:46 -0700)]
Fix potential problem with default rsc number
Change-Id: I8205dbb2488232084f984a10963bb9286ff19e0e
nicolasroard [Tue, 12 Mar 2013 15:46:09 +0000 (15:46 +0000)]
am
a3f5378b: am
b2fcd425: Fix layout on phones
* commit '
a3f5378b0cc5f84243821856975afcee490e284a':
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
George Mount [Mon, 11 Mar 2013 19:58:46 +0000 (12:58 -0700)]
Add support for local storage of uploaded pictures.
Change-Id: I23c86e6a95871effcb76a54b16b9ab7720a63383
The Android Open Source Project [Tue, 12 Mar 2013 14:18:14 +0000 (14:18 +0000)]
am
b566c822: (-s ours) am
c2349abd: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
b566c82211e72af234c786eac65fec3ecb9a8fb8':
Don't record video before preview is started
Fix camera switcher mode picker
fix undo bug
Fix NPE in switcher popup
The Android Open Source Project [Tue, 12 Mar 2013 14:16:33 +0000 (14:16 +0000)]
am
c2349abd: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
c2349abde4087ce2cb4b260d7ba7b26844365a2b':
Don't record video before preview is started
Fix camera switcher mode picker
fix undo bug
Fix NPE in switcher popup
The Android Open Source Project [Tue, 12 Mar 2013 14:14:59 +0000 (07:14 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iee469c89331fc9626c24bf2c42890c8abb7f1380
The Android Automerger [Tue, 12 Mar 2013 12:56:09 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Tue, 12 Mar 2013 04:04:30 +0000 (21:04 -0700)]
Fix layout on phones
Change-Id: I147b00f1abf032877c7461138ec78149bfd8b519
nicolasroard [Tue, 12 Mar 2013 03:53:42 +0000 (03:53 +0000)]
am
a64bab3c: am
3974ae68: am
ad961df1: 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 '
a64bab3c7cffc20a342109edb142ce823d0d1c31':
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
OSDN Git Service
