OSDN Git Service
Senpo Hu [Wed, 10 Sep 2014 00:21:39 +0000 (00:21 +0000)]
am
65c00136: Set video quality pref default values at startup.
* commit '
65c00136cde07e050d05e3da61876199df90dd18':
Set video quality pref default values at startup.
Senpo Hu [Tue, 9 Sep 2014 20:51:25 +0000 (13:51 -0700)]
Set video quality pref default values at startup.
The problem of the old approach is the default values never got set
until switching on video module.
The caveat of the this CL is that the default value tweak is only applied
for Shamu. Rather than basing on device model string, detecting
CamcorderProfile capability is a better way to get this job done. However,
|CamcorderProfile.hasProfile| needs camera id info so I'd argue this CL
is good enough for the Shamu/L release.
Bug:
17060480
Change-Id: Ia53ff6aecad44fe7a32257fa1415163f167c09bf
Spike Sprague [Tue, 9 Sep 2014 18:19:30 +0000 (18:19 +0000)]
am
767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier
* commit '
767a1186a1127f070785d50054a0e1a02975eb4a':
back to bigger HDR+ icons
Spike Sprague [Tue, 9 Sep 2014 18:14:13 +0000 (18:14 +0000)]
Merge "back to bigger HDR+ icons" into ub-camera-glacier
Spike Sprague [Tue, 9 Sep 2014 18:02:09 +0000 (11:02 -0700)]
back to bigger HDR+ icons
bug:
17304734
Change-Id: I9b2b22101003b2d13f386367245622d4e13c0309
Alan Newberger [Mon, 8 Sep 2014 22:09:22 +0000 (22:09 +0000)]
am
f974ba71: Additional logging for CAPTURE intent handling
* commit '
f974ba719a1255b6bda1b214842641fb5736a877':
Additional logging for CAPTURE intent handling
Alan Newberger [Mon, 8 Sep 2014 21:44:30 +0000 (14:44 -0700)]
Additional logging for CAPTURE intent handling
Adds verbose logging and some exception log warnings to help diagnose issues
in CAPTURE intents.
Bug:
17421140
Change-Id: Ib0afe4219418b1e7ee5ca4879e39a4448ec13cc0
Andy Huibers [Mon, 8 Sep 2014 21:17:16 +0000 (14:17 -0700)]
[try 2] resolved conflicts for merge of
6281a794 to ub-camera-haleakala
Change-Id: Ie98a22f57af23c80e08e47c841e22fef02036799
Andy Huibers [Mon, 8 Sep 2014 21:08:33 +0000 (14:08 -0700)]
resolved conflicts for merge of
6281a794 to ub-camera-haleakala
Change-Id: Ie488ba4103bc69f5a03bff8ef9be23a93aec51f6
Andy Huibers [Mon, 8 Sep 2014 20:53:28 +0000 (20:53 +0000)]
Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier
Andy Huibers [Sun, 7 Sep 2014 03:44:25 +0000 (20:44 -0700)]
In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
Bug:
17397777
Bug:
17028594
Bug:
17391241
Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f
Alan Newberger [Mon, 8 Sep 2014 18:26:27 +0000 (11:26 -0700)]
DO NOT MERGE Update Camera2 to use latest APIs
Bug:
17423266
Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e
(cherry picked from commit
76215c98a9a11d87b5ce9d2b4198654c2b8bbddf)
Alan Newberger [Mon, 8 Sep 2014 19:04:06 +0000 (19:04 +0000)]
am
76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs
* commit '
76215c98a9a11d87b5ce9d2b4198654c2b8bbddf':
DO NOT MERGE Update Camera2 to use latest APIs
Alan Newberger [Mon, 8 Sep 2014 18:26:27 +0000 (11:26 -0700)]
DO NOT MERGE Update Camera2 to use latest APIs
Bug:
17423266
Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e
Puneet Lall [Mon, 8 Sep 2014 18:21:48 +0000 (18:21 +0000)]
Merge "Enable more rapid zsl capture" into ub-camera-haleakala
Spike Sprague [Mon, 8 Sep 2014 17:41:46 +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 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: Ie64f9500fe4e8044797132e3762521f68b5bc80e
Sascha Häberling [Sat, 6 Sep 2014 02:58:09 +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:09 +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 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 02:13:09 +0000 (02:13 +0000)]
am
f6bf65e9: Pipe context through to camera
* commit '
f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6':
Pipe context through to camera
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
Puneet Lall [Sat, 6 Sep 2014 00:14:41 +0000 (17:14 -0700)]
Enable more rapid zsl capture
Change-Id: I0f036a60f2f5f53092e544e8ec4890bbfeb9e659
Puneet Lall [Fri, 5 Sep 2014 23:40:25 +0000 (23:40 +0000)]
Merge "Zsl, handle null CaptureResults, increase ring buffer size" into ub-camera-haleakala
Alan Newberger [Fri, 5 Sep 2014 23:32:35 +0000 (23:32 +0000)]
Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-haleakala
Alan Newberger [Fri, 5 Sep 2014 23:31:43 +0000 (23:31 +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:31:42 +0000 (23:31 +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: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
(cherry picked from commit
21fdb9db957973fa00777b65787db7e887fc070d)
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
Puneet Lall [Fri, 5 Sep 2014 23:00:07 +0000 (23:00 +0000)]
Merge "Implemented rotation of zsl images" into ub-camera-haleakala
Puneet Lall [Fri, 5 Sep 2014 17:38:39 +0000 (10:38 -0700)]
Implemented rotation of zsl images
Bug:
17370310
Change-Id: Ida437d817482d19224d7afd2f06b00960480bd1c
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
Puneet Lall [Fri, 5 Sep 2014 22:44:24 +0000 (15:44 -0700)]
Zsl, handle null CaptureResults, increase ring buffer size
Change-Id: I288b85eab04666718af61a07d0db8382ac4f72e2
Eino-Ville Talvala [Fri, 5 Sep 2014 20:55:43 +0000 (20:55 +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:09:06 +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 [Thu, 4 Sep 2014 23:27:20 +0000 (23:27 +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:07:57 +0000 (22:07 +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 20:23:26 +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 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:40:24 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Thu, 4 Sep 2014 18:40:23 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
Puneet Lall [Thu, 4 Sep 2014 18:22:52 +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:07:13 +0000 (00:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4a0c742753c71d076d00fd5b1da46ce942289377
Auto-generated-cl: translation import
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
Puneet Lall [Thu, 4 Sep 2014 01:21:43 +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:42 +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:19:35 +0000 (00:19 +0000)]
am
2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
* commit '
2b084ec5c7c262003581be3584825300269adae2':
Fixing settings upgrades
Alan Newberger [Thu, 4 Sep 2014 00:06:17 +0000 (00:06 +0000)]
Merge "Fixing settings upgrades" into ub-camera-glacier
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 22:05:44 +0000 (22:05 +0000)]
Merge "Force ZSL and CaptureModule to be enabled." into ub-camera-haleakala
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:27:02 +0000 (21:27 +0000)]
am
4d6d676c: Refactor default picture size selection in zsl cam.
* commit '
4d6d676c368b70e8c0fcf462e51de1d59fe34028':
Refactor default picture size selection in zsl cam.
Puneet Lall [Wed, 3 Sep 2014 20:22:01 +0000 (13:22 -0700)]
Refactor default picture size selection in zsl cam.
Bug:
17322843
Change-Id: Ib34584937db639f984689042bd8371443a33bb64
Puneet Lall [Wed, 3 Sep 2014 18:08:45 +0000 (18:08 +0000)]
am
686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier
* commit '
686c7b55a6b0c9c7202383e0589b190e5439ce69':
[ZSL Cam] Use largest supported size if no picture size is already set.
Puneet Lall [Wed, 3 Sep 2014 18:01:21 +0000 (18:01 +0000)]
Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier
Andy Huibers [Wed, 3 Sep 2014 17:54:30 +0000 (17:54 +0000)]
am
4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
* commit '
4d7f3be87a92c7efac7cf92bbd4ce7dd61f46e0d':
CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
Puneet Lall [Wed, 3 Sep 2014 17:43:35 +0000 (10:43 -0700)]
[ZSL Cam] Use largest supported size if no picture size is already set.
Fixes crash due to null size when zsl is started for the first time on a
fresh device.
Bug:
17322843
Change-Id: I31ef4202c13cee1270af59231f93842fa0e86009
Andy Huibers [Wed, 3 Sep 2014 05:12:09 +0000 (22:12 -0700)]
CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
Bug:
17204673
Change-Id: I438c3d4e7a9aad3f8fc709d255a249399bb05b57
Andy Huibers [Wed, 3 Sep 2014 02:28:59 +0000 (02:28 +0000)]
am
d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier
* commit '
d568e524029dc538d774d3d7b45586639549c79a':
Add countdown timer to CaptureModule.
Andy Huibers [Wed, 3 Sep 2014 02:16:26 +0000 (02:16 +0000)]
Merge "Add countdown timer to CaptureModule." into ub-camera-glacier
Puneet Lall [Wed, 3 Sep 2014 02:15:10 +0000 (19:15 -0700)]
Force ZSL and CaptureModule to be enabled.
Temporary setting for testing zsl.
Bug:
17322843
Change-Id: I71befcd30d5ff60a52e041dbbef95fec66691a14
Andy Huibers [Tue, 2 Sep 2014 18:27:11 +0000 (11:27 -0700)]
Add countdown timer to CaptureModule.
Bug:
16654225
Bug:
17204673
Change-Id: I914094b204743ddbe786ef1a7621564e864ed834
Sascha Haeberling [Tue, 2 Sep 2014 23:15:23 +0000 (23:15 +0000)]
am
7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier
* commit '
7718b87b566b20d11dfa2dd97f60018e601ad409':
A few Size clean-ups to support live metering changes.
Sascha Haeberling [Tue, 2 Sep 2014 23:06:57 +0000 (23:06 +0000)]
Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier
Spike Sprague [Tue, 2 Sep 2014 22:42:10 +0000 (22:42 +0000)]
am
b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier
* commit '
b9f4b931949dbddeba61b0a6bfcc52d24e01c97c':
actionbar opactiy tweaks
Spike Sprague [Tue, 2 Sep 2014 22:33:35 +0000 (22:33 +0000)]
Merge "actionbar opactiy tweaks" into ub-camera-glacier
Spike Sprague [Thu, 28 Aug 2014 22:48:50 +0000 (15:48 -0700)]
actionbar opactiy tweaks
bug:
17319586
Change-Id: I2bfde2db9cff62b6ac8d8f416c1f8512c25bd900
Spike Sprague [Tue, 2 Sep 2014 22:29:01 +0000 (22:29 +0000)]
am
9bfd6bdd: shutter button color fix (pre-L)
* commit '
9bfd6bddaa09ccdadabf3b0e7e2b81bc1bcf175d':
shutter button color fix (pre-L)
Spike Sprague [Mon, 18 Aug 2014 17:53:51 +0000 (10:53 -0700)]
shutter button color fix (pre-L)
bug:
17011894
Change-Id: Ic7626f89c811c08f1d16bb5e42fa9169b1e65759
Sascha Haeberling [Tue, 2 Sep 2014 21:20:57 +0000 (14:20 -0700)]
A few Size clean-ups to support live metering changes.
Bug:
16948752
Change-Id: I262a6b3caa42ecd7a4da40d1eaca6a7eaa96be98
Andy Huibers [Tue, 2 Sep 2014 20:58:14 +0000 (20:58 +0000)]
am
5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier
* commit '
5ca2e0b94a3031ff2117c5e68f8198a2f174b8eb':
Remove android.hardware.camera2 import from Settings3A.
Andy Huibers [Tue, 2 Sep 2014 20:51:55 +0000 (20:51 +0000)]
Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier
Andy Huibers [Tue, 2 Sep 2014 20:11:37 +0000 (13:11 -0700)]
Remove android.hardware.camera2 import from Settings3A.
Bug:
17358060
Change-Id: I7e4442a4257acf9e4b58981be697949aba62a31f
Senpo Hu [Tue, 2 Sep 2014 19:01:19 +0000 (19:01 +0000)]
am
10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier
* commit '
10fcde551bddb786e4cae0da3ed81a687cf2d470':
Starting share/edit/play activities in its own task.
Senpo Hu [Tue, 2 Sep 2014 18:53:54 +0000 (18:53 +0000)]
Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier
Senpo Hu [Fri, 29 Aug 2014 23:27:03 +0000 (16:27 -0700)]
Starting share/edit/play activities in its own task.
Bug:
17091348
Change-Id: Ib90173e164fab2a1aba753ab4d4f05d305d3d522
Alan Newberger [Sat, 30 Aug 2014 00:49:47 +0000 (00:49 +0000)]
am
ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
* commit '
ef4819104fa5e69b7654afcf2f388760e7989b24':
Ensure ZoomView appears on top of other views in L
Alan Newberger [Sat, 30 Aug 2014 00:43:49 +0000 (00:43 +0000)]
Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
Alan Newberger [Sat, 30 Aug 2014 00:34:48 +0000 (17:34 -0700)]
Ensure ZoomView appears on top of other views in L
Since our normal image view now has an elevation on L, just calling
bringChildToFront() is not enough, elevation supersedes z order.
So we also ensure the ZoomView is at max elevation when we bring it
to front.
Bug:
17331586
Change-Id: I34b06949d063daa08d964003b28a245eb6133f95
Andy Huibers [Sat, 30 Aug 2014 00:17:30 +0000 (00:17 +0000)]
am
b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
* commit '
b868274c9dc8d9c772ec89fb5955215cc7911087':
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
Andy Huibers [Wed, 27 Aug 2014 22:28:42 +0000 (15:28 -0700)]
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
Bug:
17202848
Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f
Puneet Lall [Fri, 29 Aug 2014 02:09:57 +0000 (02:09 +0000)]
am
68c25ac5: ZSL refactoring
* commit '
68c25ac5373126670cb6c2324e40537bb47e72d9':
ZSL refactoring
Puneet Lall [Fri, 29 Aug 2014 01:36:33 +0000 (18:36 -0700)]
ZSL refactoring
Bug:
16961251
Change-Id: I19642f5de088135db6650df98a62dd8dd462e0da