OSDN Git Service
Spike Sprague [Mon, 8 Sep 2014 18:52:51 +0000 (18:52 +0000)]
am
b5825fcb: am
f63357a7: am
994d9136: am
954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
* commit '
b5825fcb5a42ecdaebe65e86a9cbcc91b83a23df':
wait for filmstrip bottom panel buttons to finish animating to show clings
Spike Sprague [Mon, 8 Sep 2014 18:44:37 +0000 (18:44 +0000)]
am
f63357a7: am
994d9136: am
954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
* commit '
f63357a76a742d5ca28d8545ea1b74b68e0827c2':
wait for filmstrip bottom panel buttons to finish animating to show clings
Spike Sprague [Mon, 8 Sep 2014 18:22:38 +0000 (18:22 +0000)]
am
994d9136: am
954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
* commit '
994d9136e0085e2fbb30f260ec140c8d2c6295df':
wait for filmstrip bottom panel buttons to finish animating to show clings
Spike Sprague [Mon, 8 Sep 2014 17:41:47 +0000 (17:41 +0000)]
am
954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
* commit '
954b9b1ce7cd3e7b4a4c0fa35f8ca873fba5ac14':
wait for filmstrip bottom panel buttons to finish animating to show clings
Spike Sprague [Mon, 8 Sep 2014 17:31:33 +0000 (17:31 +0000)]
Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
Sascha Häberling [Sat, 6 Sep 2014 03:29:47 +0000 (03:29 +0000)]
am
7ab57266: (-s ours) am
34668064: am
dc563a37: am
13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera
* commit '
7ab57266d33d2481aea1494ac94334d03366fb04':
DO NOT MERGE Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 03:29:46 +0000 (03:29 +0000)]
am
af53bfd9: am
0957c854: am
4a9de272: am
bcc384ea: Revert "Pipe context through to camera"
* commit '
af53bfd91c7754d8842770e40ccdbb74d0becf85':
Revert "Pipe context through to camera"
Sascha Haeberling [Sat, 6 Sep 2014 03:20:26 +0000 (03:20 +0000)]
am
89e58112: am
3675e6e9: am
8b239e7d: am
f6bf65e9: Pipe context through to camera
* commit '
89e58112c83152d7c3d8d23e9b23a13614864b19':
Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 03:19:16 +0000 (03:19 +0000)]
am
34668064: am
dc563a37: am
13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera
* commit '
34668064f6e443417904a0bee89ae877c7610854':
DO NOT MERGE Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 03:19:16 +0000 (03:19 +0000)]
am
0957c854: am
4a9de272: am
bcc384ea: Revert "Pipe context through to camera"
* commit '
0957c85465fb95e746fde94e36ac0f6a5a7a8ce9':
Revert "Pipe context through to camera"
Sascha Haeberling [Sat, 6 Sep 2014 03:08:30 +0000 (03:08 +0000)]
am
3675e6e9: am
8b239e7d: am
f6bf65e9: Pipe context through to camera
* commit '
3675e6e9b152678b892010fcc75690861d1e9bc5':
Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 03:07:59 +0000 (03:07 +0000)]
am
dc563a37: am
13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera
* commit '
dc563a3713e1cd6c4cc2c1681cac081b753e161b':
DO NOT MERGE Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 03:07:58 +0000 (03:07 +0000)]
am
4a9de272: am
bcc384ea: Revert "Pipe context through to camera"
* commit '
4a9de272c251432c100986f8167618d101e5a522':
Revert "Pipe context through to camera"
Sascha Haeberling [Sat, 6 Sep 2014 02:58:44 +0000 (02:58 +0000)]
am
8b239e7d: am
f6bf65e9: Pipe context through to camera
* commit '
8b239e7d9021d9c674f68e688c131fb95fa4daa7':
Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 02:58:11 +0000 (02:58 +0000)]
am
13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera
* commit '
13d07d0ecb3bc808fb6f5b65508b1948ab3149d8':
DO NOT MERGE Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 02:58:10 +0000 (02:58 +0000)]
am
bcc384ea: Revert "Pipe context through to camera"
* commit '
bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52':
Revert "Pipe context through to camera"
Sascha Häberling [Sat, 6 Sep 2014 02:50:42 +0000 (02:50 +0000)]
DO NOT MERGE Pipe context through to camera
Bug:
17203825
Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468
Will also apply this one to haleakala.
Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a
Sascha Haeberling [Sat, 6 Sep 2014 02:48:22 +0000 (02:48 +0000)]
am
f6bf65e9: Pipe context through to camera
* commit '
f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6':
Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 02:48:13 +0000 (02:48 +0000)]
Revert "Pipe context through to camera"
Second half of the CL didn't make it through to lmp-dev due to Camera API change craziness. Reverting this one to unbreak the build and will submit again to G and H Camera branches only.
This reverts commit
f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6.
Change-Id: I5e11c5c1b29586110ed504fbb1be2dfe76accab0
Sascha Haeberling [Sat, 6 Sep 2014 00:33:59 +0000 (17:33 -0700)]
Pipe context through to camera
Bug:
17203825
Also don't just activate the shutter after a picture has been taken
since some cameras might not be ready for another picture yet.
This decision should be up to the camera.
Change-Id: I5991da1d8fc942b48fe085b18ec93b07bfafe889
Alan Newberger [Sat, 6 Sep 2014 00:10:40 +0000 (00:10 +0000)]
am
392c218a: (-s ours) am
d1357db3: am
02965e8c: am
9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier
* commit '
392c218a92b8c8875d86f38901d2f2774ef0bed5':
DO NOT MERGE Revert "Update camera2 API usage"
Alan Newberger [Sat, 6 Sep 2014 00:10:39 +0000 (00:10 +0000)]
am
5a4db638: am
bd74f511: am
626a1450: am
200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier
* commit '
5a4db638bc5c1738396062508c9f959da9fb8c90':
Close the camera when the async open callback runs after pause
Alan Newberger [Fri, 5 Sep 2014 23:58:18 +0000 (23:58 +0000)]
am
d1357db3: am
02965e8c: am
9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier
* commit '
d1357db3bdd29d45e310b1f7630e6cc29f2dad33':
DO NOT MERGE Revert "Update camera2 API usage"
Alan Newberger [Fri, 5 Sep 2014 23:58:17 +0000 (23:58 +0000)]
am
bd74f511: am
626a1450: am
200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier
* commit '
bd74f511c391e781605dcabe783011ec30e6ebb8':
Close the camera when the async open callback runs after pause
Alan Newberger [Fri, 5 Sep 2014 23:46:09 +0000 (23:46 +0000)]
am
02965e8c: am
9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier
* commit '
02965e8c82a707c037d72fe4c887e6270e900d54':
DO NOT MERGE Revert "Update camera2 API usage"
Alan Newberger [Fri, 5 Sep 2014 23:46:08 +0000 (23:46 +0000)]
am
626a1450: am
200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier
* commit '
626a14505d709202c9949df1bb3376d93c755d5b':
Close the camera when the async open callback runs after pause
Alan Newberger [Fri, 5 Sep 2014 23:32:14 +0000 (23:32 +0000)]
am
9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier
* commit '
9eb0eb55e686c84d0003cdcd60c76e08ed369468':
DO NOT MERGE Revert "Update camera2 API usage"
Alan Newberger [Fri, 5 Sep 2014 23:32:13 +0000 (23:32 +0000)]
am
200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier
* commit '
200d5f833a70616465fecb200d45bc2726bd1499':
Close the camera when the async open callback runs after pause
Alan Newberger [Fri, 5 Sep 2014 23:24:02 +0000 (23:24 +0000)]
Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier
Alan Newberger [Fri, 5 Sep 2014 23:23:14 +0000 (23:23 +0000)]
Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier
Alan Newberger [Fri, 5 Sep 2014 23:14:10 +0000 (23:14 +0000)]
DO NOT MERGE Revert "Update camera2 API usage"
This temporarily reverts commit for unbundled branch
9c84812bba91831e1759c23e8c92082a8a5f44fd.
Change-Id: Ic4767cd27373c36dd77df4469f5006ced8746f9f
Spike Sprague [Fri, 5 Sep 2014 22:11:15 +0000 (15:11 -0700)]
wait for filmstrip bottom panel buttons to finish animating
to show clings
bug:
17321626
Change-Id: Ib810157a2821ed40b2d1e30bee80bf1cc243ee59
Alan Newberger [Fri, 5 Sep 2014 22:52:39 +0000 (15:52 -0700)]
Close the camera when the async open callback runs after pause
Current implementation leaves the camera device open if callback
returns after app is paused, since activity/module pausing is
already complete before the camera opened. This CL adds a close
if the opened callback returns when the activity is already paused.
Bug:
17397753
Change-Id: Iec5d16445201b4e308b16e9237fd98ed8599fddc
Eino-Ville Talvala [Fri, 5 Sep 2014 22:15:06 +0000 (22:15 +0000)]
am
9f5358c9: am
60e2b6bd: am
fb69fffc: am
82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier
* commit '
9f5358c9b18a8ef9de99dd6ee18c0d55312062c7':
Update camera2 API usage
Eino-Ville Talvala [Fri, 5 Sep 2014 21:57:37 +0000 (21:57 +0000)]
am
60e2b6bd: am
fb69fffc: am
82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier
* commit '
60e2b6bde0ff7570e5879520355f1d8669b06d57':
Update camera2 API usage
Alan Newberger [Fri, 5 Sep 2014 21:33:43 +0000 (21:33 +0000)]
am
0515ad58: am
e71143b8: am
252394a7: am
29a009c9: Add additional lifecycle logging to Camera
* commit '
0515ad5889f33d0a26e6086a57e38a177c84320b':
Add additional lifecycle logging to Camera
Eino-Ville Talvala [Fri, 5 Sep 2014 21:00:59 +0000 (21:00 +0000)]
am
fb69fffc: am
82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier
* commit '
fb69fffc74f3768ca13881770e884a55c66e6edd':
Update camera2 API usage
Eino-Ville Talvala [Fri, 5 Sep 2014 20:53:10 +0000 (20:53 +0000)]
am
82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier
* commit '
82465c1c603d3d76bf8c7487779766d5ea38a5cd':
Update camera2 API usage
Eino-Ville Talvala [Fri, 5 Sep 2014 20:44:02 +0000 (20:44 +0000)]
Merge "Update camera2 API usage" into ub-camera-glacier
Alan Newberger [Fri, 5 Sep 2014 20:36:02 +0000 (20:36 +0000)]
am
e71143b8: am
252394a7: am
29a009c9: Add additional lifecycle logging to Camera
* commit '
e71143b80c5966dded05d71a3c4d1f30be8cbf60':
Add additional lifecycle logging to Camera
Alan Newberger [Fri, 5 Sep 2014 20:21:17 +0000 (20:21 +0000)]
am
252394a7: am
29a009c9: Add additional lifecycle logging to Camera
* commit '
252394a7175ed6b072ebb383aec010094dda29ee':
Add additional lifecycle logging to Camera
Alan Newberger [Fri, 5 Sep 2014 20:09:33 +0000 (20:09 +0000)]
am
29a009c9: Add additional lifecycle logging to Camera
* commit '
29a009c974f153f72cd5e28851a8cb85a691e215':
Add additional lifecycle logging to Camera
Alan Newberger [Fri, 5 Sep 2014 19:47:42 +0000 (12:47 -0700)]
Add additional lifecycle logging to Camera
To assist in diagnosing startup issues, added some logging.
Bug:
17397753
Change-Id: Icc47ec278c0b68c8834bfb52554425ff7f371ea0
Eino-Ville Talvala [Thu, 4 Sep 2014 22:57:24 +0000 (15:57 -0700)]
Update camera2 API usage
Rename listeners to callbacks
Bug:
17389922
Change-Id: I33affcaeec331eca2d084ded4eb199f86fa58765
Sascha Haeberling [Fri, 5 Sep 2014 00:02:20 +0000 (00:02 +0000)]
am
3a12e5ce: am
d316c8f9: am
9bb10857: am
dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier
* commit '
3a12e5ce74dc81be0949c64c4ace9afad7466a5f':
Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
Sascha Haeberling [Thu, 4 Sep 2014 23:53:20 +0000 (23:53 +0000)]
am
d316c8f9: am
9bb10857: am
dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier
* commit '
d316c8f9929481ad9b273256c0608987213a8f6e':
Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
Sascha Haeberling [Thu, 4 Sep 2014 23:40:12 +0000 (23:40 +0000)]
am
9bb10857: am
dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier
* commit '
9bb108571e7e6ddcef5bdf0e9ee03dad57ebc44f':
Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
Sascha Haeberling [Thu, 4 Sep 2014 23:28:15 +0000 (23:28 +0000)]
am
dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier
* commit '
dc0369f37b07adb4355113540af3c1f7c82a404e':
Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
Sascha Haeberling [Thu, 4 Sep 2014 23:20:19 +0000 (23:20 +0000)]
Merge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots." into ub-camera-glacier
Sascha Haeberling [Thu, 4 Sep 2014 20:32:35 +0000 (13:32 -0700)]
Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
Bug:
16654225
Change-Id: I939e4793125cc996e26bbd5a13579f2f4ebab663
Spike Sprague [Thu, 4 Sep 2014 22:38:36 +0000 (22:38 +0000)]
am
f8b42f26: am
6a350833: am
844827b9: am
eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier
* commit '
f8b42f2673ff30b391af29716bf9044c9cd6a46d':
remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
Spike Sprague [Thu, 4 Sep 2014 22:30:59 +0000 (22:30 +0000)]
am
6a350833: am
844827b9: am
eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier
* commit '
6a350833e973f5851b2b20339df088997b44c598':
remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
Spike Sprague [Thu, 4 Sep 2014 22:15:47 +0000 (22:15 +0000)]
am
844827b9: am
eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier
* commit '
844827b9d6f1f1ecdf94e82493bfa0f9ae527090':
remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
Spike Sprague [Thu, 4 Sep 2014 22:08:12 +0000 (22:08 +0000)]
am
eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier
* commit '
eacf94608e5358a028c64dd1523270e61093e8b2':
remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
Spike Sprague [Thu, 4 Sep 2014 21:57:34 +0000 (21:57 +0000)]
Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier
Spike Sprague [Thu, 4 Sep 2014 18:54:26 +0000 (11:54 -0700)]
remove stray bool resource for determining if OS is L or not,
moved to more universal ApiHelper for that.
this brings back the fade-in on shutter button touchDown.
bug:
17389859
Change-Id: I7c7d24db30bfbb149f84e6f5acf3e211c282c1ec
Andy Huibers [Thu, 4 Sep 2014 21:13:47 +0000 (21:13 +0000)]
am
eeb21f9f: am
80b320ea: am
dc3d3e52: am
17d9084e: Add short flash animation and shutter sound to ZSL camera.
* commit '
eeb21f9f73f58fc08521d1a0bf0adecb96d0934e':
Add short flash animation and shutter sound to ZSL camera.
Andy Huibers [Thu, 4 Sep 2014 21:00:21 +0000 (21:00 +0000)]
am
80b320ea: am
dc3d3e52: am
17d9084e: Add short flash animation and shutter sound to ZSL camera.
* commit '
80b320eaabd6a4ead7d821c4bf07bc642a447af0':
Add short flash animation and shutter sound to ZSL camera.
Andy Huibers [Thu, 4 Sep 2014 20:29:23 +0000 (20:29 +0000)]
am
dc3d3e52: am
17d9084e: Add short flash animation and shutter sound to ZSL camera.
* commit '
dc3d3e520cafecd8024b08c5a5162c13ae438f1c':
Add short flash animation and shutter sound to ZSL camera.
Andy Huibers [Thu, 4 Sep 2014 20:23:37 +0000 (20:23 +0000)]
am
17d9084e: Add short flash animation and shutter sound to ZSL camera.
* commit '
17d9084e38e64f06a9d411d64fe3c2739d299cda':
Add short flash animation and shutter sound to ZSL camera.
Andy Huibers [Thu, 28 Aug 2014 22:05:57 +0000 (15:05 -0700)]
Add short flash animation and shutter sound to ZSL camera.
Bug:
17217567
Change-Id: I9a75fdd15e03f47029ef4a631287899718794c5c
Baligh Uddin [Thu, 4 Sep 2014 19:22:12 +0000 (19:22 +0000)]
am
62c49d47: (-s ours) am
40ac020c: (-s ours) am
b43f973a: (-s ours) am
f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
62c49d479fb47d30c49672ee88457798616a5a35':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 19:22:11 +0000 (19:22 +0000)]
am
6c0832c7: (-s ours) am
7f10a8c0: (-s ours) am
9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6c0832c79cf061c41da82a72b910ef5b4ae6fa3f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 19:10:53 +0000 (19:10 +0000)]
am
40ac020c: (-s ours) am
b43f973a: (-s ours) am
f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
40ac020ce150d1ee8d19d48edc6e70fb0c92f708':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 19:10:53 +0000 (19:10 +0000)]
am
7f10a8c0: (-s ours) am
9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
7f10a8c0a0cfbf6d99c10f951192f6915dd56699':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 18:59:18 +0000 (18:59 +0000)]
am
b43f973a: (-s ours) am
f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
b43f973a2389f4d9e45d35bffee92e70b4bce704':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 18:59:17 +0000 (18:59 +0000)]
am
9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9351f22c49705fc1df51bb5f3c9afc9e08f95b94':
Import translations. DO NOT MERGE
Puneet Lall [Thu, 4 Sep 2014 18:53:50 +0000 (18:53 +0000)]
am
8d2eeb52: am
ab541776: am
6fa0451d: am
f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier
* commit '
8d2eeb525c89b58172dc973cc7dc7ebe0ac7cb1c':
Added log for first preview frame
Baligh Uddin [Thu, 4 Sep 2014 18:52:28 +0000 (18:52 +0000)]
am
f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
f096e898055178994d372525139fd47f625aa85f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 18:51:05 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 4 Sep 2014 18:51:01 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Puneet Lall [Thu, 4 Sep 2014 18:40:29 +0000 (18:40 +0000)]
am
ab541776: am
6fa0451d: am
f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier
* commit '
ab541776f9db60aa1475589e753e452a0242432e':
Added log for first preview frame
Baligh Uddin [Thu, 4 Sep 2014 18:40:24 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Puneet Lall [Thu, 4 Sep 2014 18:30:00 +0000 (18:30 +0000)]
am
6fa0451d: am
f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier
* commit '
6fa0451dc863184c4b052d6e8e85bfe37a33f5fe':
Added log for first preview frame
Puneet Lall [Thu, 4 Sep 2014 18:22:59 +0000 (18:22 +0000)]
am
f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier
* commit '
f1e3dc865aa7dfcb3fee584b8e37fd24c23e78c0':
Added log for first preview frame
Puneet Lall [Thu, 4 Sep 2014 18:11:44 +0000 (18:11 +0000)]
Merge "Added log for first preview frame" into ub-camera-glacier
Puneet Lall [Thu, 4 Sep 2014 18:05:14 +0000 (11:05 -0700)]
Added log for first preview frame
Bug:
17386943
Change-Id: I17907402c9d1cd4678634e2ceb8cbf921f010d9f
Baligh Uddin [Thu, 4 Sep 2014 07:06:22 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f25ac4e3c13fcd64389cf61422fd64c831c8d02
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Sep 2014 07:04:59 +0000 (00:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6a46172bb51bfa2e6faa75d8f9ddeb1e46a5c35
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Sep 2014 07:03:16 +0000 (00:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I95951618c47241ab89d780f6ebe39e30ae08d332
Auto-generated-cl: translation import
Puneet Lall [Thu, 4 Sep 2014 03:39:56 +0000 (03:39 +0000)]
am
4442501d: am
b80e7562: am
f8ae4fb6: am
ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit '
4442501d5e2cb59b2da52c4fabad166eedb8d93e':
Re-enable shutter-button when switching between front and back cameras.
Alan Newberger [Thu, 4 Sep 2014 03:39:55 +0000 (03:39 +0000)]
am
7c1cddea: am
f3e53dc1: am
a4258d82: am
2ef0f9dc: Fix unnecessary string cast
* commit '
7c1cddea0f14258d582bded9fa48014d2a251857':
Fix unnecessary string cast
Puneet Lall [Thu, 4 Sep 2014 03:22:17 +0000 (03:22 +0000)]
am
b80e7562: am
f8ae4fb6: am
ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit '
b80e75620c339ec360c5e3769adefe7c239ea940':
Re-enable shutter-button when switching between front and back cameras.
Alan Newberger [Thu, 4 Sep 2014 03:22:16 +0000 (03:22 +0000)]
am
f3e53dc1: am
a4258d82: am
2ef0f9dc: Fix unnecessary string cast
* commit '
f3e53dc11e59e0b0416edd924f0b2e267e484d6b':
Fix unnecessary string cast
Puneet Lall [Thu, 4 Sep 2014 01:32:04 +0000 (01:32 +0000)]
am
f8ae4fb6: am
ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit '
f8ae4fb65167cf669b7788ac035b31575005964b':
Re-enable shutter-button when switching between front and back cameras.
Alan Newberger [Thu, 4 Sep 2014 01:32:03 +0000 (01:32 +0000)]
am
a4258d82: am
2ef0f9dc: Fix unnecessary string cast
* commit '
a4258d829019884b2b6396b4728765d2cdb79923':
Fix unnecessary string cast
Puneet Lall [Thu, 4 Sep 2014 01:21:27 +0000 (01:21 +0000)]
am
ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit '
ae6e94f570a8436715384993f2e06b2193915b78':
Re-enable shutter-button when switching between front and back cameras.
Alan Newberger [Thu, 4 Sep 2014 01:21:26 +0000 (01:21 +0000)]
am
2ef0f9dc: Fix unnecessary string cast
* commit '
2ef0f9dc95527a354846940bae675741c464e6ae':
Fix unnecessary string cast
Puneet Lall [Thu, 4 Sep 2014 01:11:50 +0000 (01:11 +0000)]
Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
Alan Newberger [Thu, 4 Sep 2014 01:02:49 +0000 (18:02 -0700)]
Fix unnecessary string cast
Code was taking a setting as a string, which when empty returns null,
then tried to parseInt it. Instead ask for an int, which will default
to zero, and things will work.
Bug:
16827108
Change-Id: I5bbed091ec29fc98257a5eb18948891c43caa29f
Alan Newberger [Thu, 4 Sep 2014 00:55:22 +0000 (00:55 +0000)]
am
adda4d26: am
54bc8e44: am
64e4bc9f: am
2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
* commit '
adda4d263a3c84643a15d7b564221b6ecc3ee27b':
Fixing settings upgrades
Alan Newberger [Thu, 4 Sep 2014 00:48:08 +0000 (00:48 +0000)]
am
54bc8e44: am
64e4bc9f: am
2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
* commit '
54bc8e449e5ff47ccbd04b34365411c109a53c05':
Fixing settings upgrades
Alan Newberger [Thu, 4 Sep 2014 00:31:51 +0000 (00:31 +0000)]
am
64e4bc9f: am
2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
* commit '
64e4bc9f0dc63a440143f17803f6e86f80139a2c':
Fixing settings upgrades
Alan Newberger [Thu, 4 Sep 2014 00:20:16 +0000 (00:20 +0000)]
am
2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
* commit '
2b084ec5c7c262003581be3584825300269adae2':
Fixing settings upgrades
Puneet Lall [Thu, 4 Sep 2014 00:16:21 +0000 (00:16 +0000)]
am
50bafb27: am
b87b255a: am
fb730076: am
4d6d676c: Refactor default picture size selection in zsl cam.
* commit '
50bafb27f091e44a5e3d5b778af559eb14540604':
Refactor default picture size selection in zsl cam.
Alan Newberger [Thu, 4 Sep 2014 00:06:17 +0000 (00:06 +0000)]
Merge "Fixing settings upgrades" into ub-camera-glacier
Puneet Lall [Wed, 3 Sep 2014 23:47:40 +0000 (23:47 +0000)]
am
b87b255a: am
fb730076: am
4d6d676c: Refactor default picture size selection in zsl cam.
* commit '
b87b255a53f91b000484e29b3fe56d6a3b367467':
Refactor default picture size selection in zsl cam.
Alan Newberger [Wed, 3 Sep 2014 01:31:10 +0000 (18:31 -0700)]
Fixing settings upgrades
Did a full audit of upgrade scenarios and performed the following fixes.
* restored pre-existing location upgrade code that handled old upgrades.
preserves location choice from C straight to G.
* added string type format conversion for "old global" values that were
not implemented in the refactor : hdr, hdr+, grid buttons
* moved a "reset" that existed in upgraders that put the user in Camera
mode on upgrade. it should run for everglades upgraders along with size
changes.
Bug:
17317510
Change-Id: I87db511bfa89676525ee727620cb546c180a8ef6
Puneet Lall [Wed, 3 Sep 2014 21:58:51 +0000 (14:58 -0700)]
Re-enable shutter-button when switching between front and back cameras.
Bug:
16961251
Change-Id: Ie3075bf711ab44dfe5e6cdd6b3645dd6583708b5
Puneet Lall [Wed, 3 Sep 2014 21:34:16 +0000 (21:34 +0000)]
am
fb730076: am
4d6d676c: Refactor default picture size selection in zsl cam.
* commit '
fb7300764d996191e4d6610c7e6558ec5d3c89a6':
Refactor default picture size selection in zsl cam.
OSDN Git Service
