OSDN Git Service
Andy Huibers [Wed, 27 Aug 2014 00:03:14 +0000 (00:03 +0000)]
am
bd9b80b2: Reset metering and focus areas when touch focus period ends.
* commit '
bd9b80b267195f78a8514847d0f02629e761a334':
Reset metering and focus areas when touch focus period ends.
Andy Huibers [Tue, 26 Aug 2014 23:21:15 +0000 (16:21 -0700)]
Reset metering and focus areas when touch focus period ends.
Bug:
17286539
Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c
Alan Newberger [Tue, 26 Aug 2014 23:19:16 +0000 (23:19 +0000)]
am
d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
* commit '
d4d1dbe00b84285bd0d235d984b9d71ea63a9305':
Remove one shot callback workaround in VideoModule for L
Alan Newberger [Tue, 26 Aug 2014 23:11:24 +0000 (23:11 +0000)]
Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
Andy Huibers [Tue, 26 Aug 2014 23:02:40 +0000 (23:02 +0000)]
am
462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
* commit '
462d9c510bbd072c63fb5be1ec12df15b4775f5f':
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Andy Huibers [Tue, 26 Aug 2014 22:57:10 +0000 (22:57 +0000)]
Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
Spike Sprague [Tue, 26 Aug 2014 22:16:57 +0000 (22:16 +0000)]
am
91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
* commit '
9109871358e32726f23d9b4db9d6fbf55a03cddc':
Material Ripple effect on filmstip buttons
Spike Sprague [Tue, 26 Aug 2014 22:06:24 +0000 (22:06 +0000)]
Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
Spike Sprague [Tue, 26 Aug 2014 21:59:43 +0000 (14:59 -0700)]
Material Ripple effect on filmstip buttons
bug:
17281225
Change-Id: Ic2876527a6d1fedaeb9ecdddbc8627e1c4e396b1
Andy Huibers [Tue, 26 Aug 2014 18:16:59 +0000 (11:16 -0700)]
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Bug:
17028594
Change-Id: I9c85178926a68c5e3ce26d04107db65514d84169
Ruben Brunk [Tue, 26 Aug 2014 21:06:59 +0000 (21:06 +0000)]
am
92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier
* commit '
92ed7b6c6d8ca735c35f5bdc6de6d15f485e19bd':
photosphere: Fix TextureView transforms.
Ruben Brunk [Tue, 26 Aug 2014 21:00:05 +0000 (21:00 +0000)]
Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier
Ruben Brunk [Tue, 26 Aug 2014 10:16:27 +0000 (03:16 -0700)]
photosphere: Fix TextureView transforms.
Bug:
17098224
- WAR to set the SurfaceTexture default buffer dimensions to
the TextureView's layout dimensions to avoid bad
scaling/translation in TextureView's HardwareLayer transform.
Change-Id: I9e7d6e6cb33d806470cb11f00d45b97218ee7c11
Alan Newberger [Thu, 21 Aug 2014 21:42:36 +0000 (14:42 -0700)]
Remove one shot callback workaround in VideoModule for L
Since there was a framework fix for the issue, we don't need
to do an extra preview callback when entering video if on L.
Bug:
16649297
Bug:
17241994
Change-Id: I67fc67ef34a661daea6991c3b895b1c1bf6b9b85
Sascha Haeberling [Tue, 26 Aug 2014 20:44:32 +0000 (20:44 +0000)]
am
afb4c581: Merge "Enable mode options when capture is done." into ub-camera-glacier
* commit '
afb4c581786bb539e8753488e29a3d13fa8b43fd':
Enable mode options when capture is done.
Sascha Haeberling [Tue, 26 Aug 2014 20:36:10 +0000 (20:36 +0000)]
Merge "Enable mode options when capture is done." into ub-camera-glacier
Sascha Haeberling [Tue, 26 Aug 2014 19:15:41 +0000 (12:15 -0700)]
Enable mode options when capture is done.
Bug:
17260403
Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7
Igor Murashkin [Tue, 26 Aug 2014 17:38:02 +0000 (17:38 +0000)]
am
666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier
* commit '
666c80b054d61bd813f0eaaa527632093f80ff02':
util: Optimal preview size picks smaller-than-display size in case of tie
Igor Murashkin [Tue, 26 Aug 2014 17:30:02 +0000 (17:30 +0000)]
Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier
Andy Huibers [Tue, 26 Aug 2014 16:46:28 +0000 (16:46 +0000)]
am
c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus.
* commit '
c0fe0b6915004303a550047e68a2124edae9fdb2':
Show animated AF ring UI when lens is moving in continuous autofocus.
Andy Huibers [Tue, 26 Aug 2014 05:25:49 +0000 (22:25 -0700)]
Show animated AF ring UI when lens is moving in continuous autofocus.
Bug:
17028594
Change-Id: I0bb7c7cb3f8264304d4375f9f2b73608c8bfc1e5
Andy Huibers [Tue, 26 Aug 2014 01:41:40 +0000 (01:41 +0000)]
am
4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-glacier
* commit '
4d04e99b46642381b1f80b2a324454ebe741c9f3':
Enable Face rectangles for debugging.
Andy Huibers [Tue, 26 Aug 2014 01:34:46 +0000 (01:34 +0000)]
Merge "Enable Face rectangles for debugging." into ub-camera-glacier
Andy Huibers [Mon, 25 Aug 2014 22:01:25 +0000 (15:01 -0700)]
Enable Face rectangles for debugging.
Bug:
17028594
Change-Id: I57521aed991f93da1f5abdace6a72be0f1057dbe
Sascha Haeberling [Mon, 25 Aug 2014 22:07:37 +0000 (22:07 +0000)]
am
46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier
* commit '
46b3c730aa059bf5103922ae0c36c13a12e98223':
Fix crash on Shamu since it's no longer camera 2 FULL.
Sascha Haeberling [Mon, 25 Aug 2014 22:00:25 +0000 (22:00 +0000)]
Merge "Fix crash on Shamu since it's no longer camera 2 FULL." into ub-camera-glacier
Sascha Haeberling [Mon, 25 Aug 2014 21:37:42 +0000 (14:37 -0700)]
Fix crash on Shamu since it's no longer camera 2 FULL.
Bug:
17258194
Shamu is no longer a FULL camera2 device. So we change our OneCamera API
to create a V2 manager for partial deviced as well (but exclude legacy).
Change-Id: Ic095a754494047bc18d6e5e729bd9dd8a915753c
Igor Murashkin [Mon, 25 Aug 2014 20:21:26 +0000 (13:21 -0700)]
util: Optimal preview size picks smaller-than-display size in case of tie
This fixes the case when 1600x1200 was selected over 1280x960 on a
Nexus 5 (display size 1920x1080); both preview sizes were equally close,
but the larger one was arbitrarily winning out.
Bug:
17216523
Change-Id: I163c29d5f46ad1b8b44825424c5202eb87855048
Spike Sprague [Mon, 25 Aug 2014 18:11:54 +0000 (18:11 +0000)]
am
4cc78bb3: set actionbar background to complete transparent
* commit '
4cc78bb37f57f1499fe3d2eaf27e2a3b3e2e19bf':
set actionbar background to complete transparent
Spike Sprague [Thu, 21 Aug 2014 17:16:10 +0000 (10:16 -0700)]
set actionbar background to complete transparent
bug:
17114270
Change-Id: I309c98ed1ddbc0c322129e185ca4cd2df1f73520
Sascha Haeberling [Sat, 23 Aug 2014 02:05:16 +0000 (02:05 +0000)]
am
392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
* commit '
392f249b8295509cf6c31984f2420b876ca5a7ac':
Enable switching within CaptureModule to HDR+ and back.
Sascha Haeberling [Sat, 23 Aug 2014 01:57:51 +0000 (01:57 +0000)]
Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
Sascha Haeberling [Thu, 21 Aug 2014 17:01:00 +0000 (10:01 -0700)]
Enable switching within CaptureModule to HDR+ and back.
Bug:
16945820
Change-Id: If92371129c5bf2a78b7623d745a8b86d218d32e1
Sol Boucher [Sat, 23 Aug 2014 01:38:39 +0000 (01:38 +0000)]
am
799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier
* commit '
799acabb5105aa1095740771457ce037422e492e':
Switch from stepwise index-based zoom to a ratio-based scale
Sol Boucher [Sat, 23 Aug 2014 01:30:24 +0000 (01:30 +0000)]
Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier
Sol Boucher [Wed, 20 Aug 2014 00:24:07 +0000 (17:24 -0700)]
Switch from stepwise index-based zoom to a ratio-based scale
This brings the app up to date with the removal of the deprecated zoom methods
in the portability layer's CameraSettings class.
Bug:
17016658
Change-Id: Icb9f773188f7481d9af991d71feaff86379f5525
Baligh Uddin [Fri, 22 Aug 2014 17:44:18 +0000 (17:44 +0000)]
am
6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
6a836bffd12d036e3c85c29134f2ada14df3c2f1':
Import translations. DO NOT MERGE
Spike Sprague [Fri, 22 Aug 2014 17:44:18 +0000 (17:44 +0000)]
am
0dec43e3: filmstrip actionbar tweaks
* commit '
0dec43e3d77fd1f40093f2f3430a6e86d8d5307b':
filmstrip actionbar tweaks
Baligh Uddin [Fri, 22 Aug 2014 17:39:45 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Fri, 22 Aug 2014 17:39:40 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
Spike Sprague [Wed, 20 Aug 2014 01:53:41 +0000 (18:53 -0700)]
filmstrip actionbar tweaks
bug:
17114274
Change-Id: I70e7b285d27f81c87442bcc9d28ae7391d028568
Spike Sprague [Fri, 22 Aug 2014 17:20:03 +0000 (17:20 +0000)]
am
fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacier
* commit '
fe1af189505e39b2d86af5b9fcec12f1661d1509':
filmstrip actionbar tweaks
Spike Sprague [Fri, 22 Aug 2014 17:12:09 +0000 (17:12 +0000)]
Merge "filmstrip actionbar tweaks" into ub-camera-glacier
Spike Sprague [Wed, 20 Aug 2014 01:53:41 +0000 (18:53 -0700)]
filmstrip actionbar tweaks
bug:
17114274
Change-Id: I0e9b3dd37325d39f5a16d81cbfaf71b98baf7510
Sascha Haeberling [Fri, 22 Aug 2014 00:57:44 +0000 (00:57 +0000)]
am
f859793d: Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier
* commit '
f859793dddc0176774eb5bac28910e9783484d97':
Pick the preview size based on the selected picture size.
Sascha Haeberling [Fri, 22 Aug 2014 00:49:21 +0000 (00:49 +0000)]
Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier
Spike Sprague [Thu, 21 Aug 2014 18:31:03 +0000 (18:31 +0000)]
am
ba97d192: animate filmstrip bottom button bar in and out from the bottom of the screen
* commit '
ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2':
animate filmstrip bottom button bar in and out from the bottom of the screen
Sascha Haeberling [Thu, 21 Aug 2014 17:04:35 +0000 (10:04 -0700)]
Pick the preview size based on the selected picture size.
Bug:
16654225
Also make this a function of the Camera device, since othe camera might
have to override the picture size.
Change-Id: Ieb6d1ffac0c3d7893416f9eae3232afde6d27240
Spike Sprague [Tue, 19 Aug 2014 22:33:45 +0000 (15:33 -0700)]
animate filmstrip bottom button bar in and out
from the bottom of the screen
bug:
17114515
Change-Id: If3024f149fc0be0e48a430468c53774893946938
Sascha Haeberling [Thu, 21 Aug 2014 00:51:56 +0000 (00:51 +0000)]
am
0382139c: Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
* commit '
0382139c99988f0002afeafb4c35f3599b1fc02f':
Enable progress reporting for modules like HDR+.
Senpo Hu [Thu, 21 Aug 2014 00:24:24 +0000 (00:24 +0000)]
am
5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into ub-camera-glacier
* commit '
5b88f9a77fc997b922f99f0f5ec956b9caee42f9':
Change Shamu's default video resolution setting.
Sascha Haeberling [Thu, 21 Aug 2014 00:40:31 +0000 (00:40 +0000)]
Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
Sol Boucher [Thu, 21 Aug 2014 00:07:13 +0000 (00:07 +0000)]
am
dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier
* commit '
dab267ce77074883e7a3dd83f45c7722c16786dc':
TextureViewHelper workaround for SurfaceTexture/CameraProxy race
Sascha Haeberling [Wed, 20 Aug 2014 23:14:29 +0000 (16:14 -0700)]
Enable progress reporting for modules like HDR+.
Bug:
16945820
Change-Id: If6aba8ff5d2b973f4ea8112110695a84f897d881
Senpo Hu [Thu, 21 Aug 2014 00:16:11 +0000 (00:16 +0000)]
Merge "Change Shamu's default video resolution setting." into ub-camera-glacier
Senpo Hu [Mon, 18 Aug 2014 23:45:45 +0000 (16:45 -0700)]
Change Shamu's default video resolution setting.
Bug:
17060480
Change-Id: I5ce8d2d2960d21856c0f13e9599d80b0edc03ec9
Andy Huibers [Wed, 20 Aug 2014 20:56:39 +0000 (20:56 +0000)]
am
2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
* commit '
2440815caec484357250ddf0442e7cde2f4241ca':
Add zoom to CaptureModule and OneCamera.
Sascha Haeberling [Wed, 20 Aug 2014 19:31:51 +0000 (19:31 +0000)]
Sascha Haeberling [Wed, 20 Aug 2014 19:20:35 +0000 (12:20 -0700)]
Remove logspam
Bug:
17157295
Change-Id: I7b6b505a7d389b59ae440dde7b30da78aaefa0c0
Andy Huibers [Wed, 20 Aug 2014 20:49:21 +0000 (20:49 +0000)]
Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
Andy Huibers [Wed, 20 Aug 2014 07:02:19 +0000 (00:02 -0700)]
Add zoom to CaptureModule and OneCamera.
Change-Id: Ia679d79a42e20e9033409939d0ca137ffcfbc75a
Alan Newberger [Wed, 20 Aug 2014 02:15:24 +0000 (02:15 +0000)]
am
08c219b7: Merge "Update AOSP Camera product icon" into ub-camera-glacier
* commit '
08c219b7ae2e32985eda869add10afa894f7140b':
Update AOSP Camera product icon
Alan Newberger [Wed, 20 Aug 2014 02:09:24 +0000 (02:09 +0000)]
Merge "Update AOSP Camera product icon" into ub-camera-glacier
Alan Newberger [Wed, 20 Aug 2014 01:53:30 +0000 (18:53 -0700)]
Update AOSP Camera product icon
Final updates for the icon. Keeping naming consistent with generated
assets.
Bug:
16985499
Change-Id: I389c2479b208dec05a0b3a1f2617d13b15913dcb
Sascha Haeberling [Tue, 19 Aug 2014 22:40:40 +0000 (22:40 +0000)]
am
6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
* commit '
6d7ed7016f28c240ae4901d076fc7f9583785c76':
roduce debug output for android.util.Pair
Sascha Haeberling [Tue, 19 Aug 2014 22:33:31 +0000 (22:33 +0000)]
Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
Sascha Haeberling [Tue, 19 Aug 2014 21:38:44 +0000 (14:38 -0700)]
roduce debug output for android.util.Pair
Bug:
16945820
Change-Id: Ia19c6fbfcaf2b1497a76e05600afc5a5b7364e50
Andy Huibers [Tue, 19 Aug 2014 20:37:31 +0000 (20:37 +0000)]
am
03e17a62: Start moving AF and 3A to separate class; improve logging.
* commit '
03e17a62b43e58c8da5cd6ee23fd0809a82ee448':
Start moving AF and 3A to separate class; improve logging.
Andy Huibers [Tue, 19 Aug 2014 20:22:44 +0000 (13:22 -0700)]
Start moving AF and 3A to separate class; improve logging.
Change-Id: Ib73415ffd5569fab8c2c3bf5ac0f35616d3ee697
Baligh Uddin [Tue, 19 Aug 2014 02:43:24 +0000 (19:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14d24dceefdb4fe46ca51182b30174cff5b623de
Auto-generated-cl: translation import
Sol Boucher [Wed, 20 Aug 2014 23:57:21 +0000 (23:57 +0000)]
Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier
Sol Boucher [Wed, 20 Aug 2014 22:54:25 +0000 (15:54 -0700)]
TextureViewHelper workaround for SurfaceTexture/CameraProxy race
CameraController#getCurrentCameraId() now returns the ID of the requested camera
device if called after #requestCamera() but before the camera device has
finished opening. Assuming the most recent request is for the desired API level
and device, this resolves an issue where no transformation matrix was applied on
returning from the settings activity.
Bug:
17140996
Change-Id: Ideaec0072acd8aab77b98b213f260907f84270de
Baligh Uddin [Tue, 19 Aug 2014 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I816f6a71f1c5fa754214261771e5dd4fc933949c
Auto-generated-cl: translation import
Alan Newberger [Tue, 19 Aug 2014 01:53:17 +0000 (01:53 +0000)]
am
34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
* commit '
34264dab0b30bfcc3af38c3211d5a9cf9f9932e6':
Remove extra parent mode from array, and make PhotoModule scope string public
Spike Sprague [Tue, 19 Aug 2014 00:51:37 +0000 (00:51 +0000)]
am
5f8927b9: Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
* commit '
5f8927b94ebed2a0710ed8c60acfbbe1d92bc437':
tweak filmstrip show/hide background for Material Design
Spike Sprague [Tue, 19 Aug 2014 00:44:58 +0000 (00:44 +0000)]
Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
Spike Sprague [Tue, 19 Aug 2014 00:18:49 +0000 (17:18 -0700)]
tweak filmstrip show/hide background for Material Design
bug:
17113925
Change-Id: I5d478e3e72346e4a333aa2399d339130c5ca4187
Spike Sprague [Mon, 18 Aug 2014 21:36:57 +0000 (21:36 +0000)]
am
66d3d0d0: add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
* commit '
66d3d0d0633324893b89e1ddec14a4710d8034c3':
add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
Spike Sprague [Mon, 18 Aug 2014 21:11:33 +0000 (14:11 -0700)]
add functionality to enable/disable clicks on a MultiToggleImageButton
without affecting its visual state.
bug:
17014507
Change-Id: I824e07d518cce9768cf48f4c50afe079ebff4121
Alan Newberger [Mon, 18 Aug 2014 19:21:13 +0000 (19:21 +0000)]
am
251402b0: Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
* commit '
251402b0765e6ca2093ed674fa15ca295896273f':
Protect Camera2 functions from null CameraDeviceInfo
Spike Sprague [Mon, 18 Aug 2014 19:21:13 +0000 (19:21 +0000)]
am
a675af27: Merge "change settings to use dark theme." into ub-camera-glacier
* commit '
a675af27505aded7ba3ceeef7421a190232533bf':
change settings to use dark theme.
Sascha Haeberling [Sat, 16 Aug 2014 05:55:58 +0000 (05:55 +0000)]
am
a2dd9ea5: Fix orientation and move it to the util class so we can use it elsewhere.
* commit '
a2dd9ea5ba031128b9f0aa3852ff59991dd3008c':
Fix orientation and move it to the util class so we can use it elsewhere.
Alan Newberger [Tue, 19 Aug 2014 01:46:29 +0000 (01:46 +0000)]
Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
Alan Newberger [Tue, 19 Aug 2014 01:40:47 +0000 (18:40 -0700)]
Remove extra parent mode from array, and make PhotoModule scope string public
When pruning modes, we neglected to remove one of the 'photo' parent modes.
This still worked because the last two entries were both 'photo'. Also,
making PhotoModule scope string public so it can be referred to by
other modules, to accomplish the same parent function as the array.
Bug:
17103121
Change-Id: I574e9a7c2db8bf2c86d810c930fbf510d5aa1a24
Spike Sprague [Mon, 18 Aug 2014 17:39:31 +0000 (17:39 +0000)]
Merge "change settings to use dark theme." into ub-camera-glacier
Alan Newberger [Mon, 18 Aug 2014 17:46:29 +0000 (17:46 +0000)]
Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
Sascha Haeberling [Sat, 16 Aug 2014 01:59:39 +0000 (01:59 +0000)]
am
096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
* commit '
096e5b734a18dae5bdca5cc312ad61ce09568f3f':
DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
Sascha Haeberling [Sat, 16 Aug 2014 01:45:15 +0000 (18:45 -0700)]
Fix orientation and move it to the util class so we can use it elsewhere.
Bug:
16948752
Change-Id: Ic7bf2f01176d8f6f1e1a70940c35531e1a5a1cbc
Sascha Haeberling [Sat, 16 Aug 2014 01:53:53 +0000 (18:53 -0700)]
DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
We only want it in Haleakala, but it go into glacier through another CL.
Change-Id: Ie08ec3e0d1ad7637650c45bf1908a04267464935
Alan Newberger [Sat, 16 Aug 2014 01:18:12 +0000 (18:18 -0700)]
Protect Camera2 functions from null CameraDeviceInfo
When the underlying camera fails, the camera1 agent
returns null for CameraDeviceInfo. Guard against this case
where it is used in app upgrading and settings.
Bug:
16982203
Change-Id: I7e4686e508993f0d0fc03eaa9e0b5dc312016eae
Sol Boucher [Sat, 16 Aug 2014 00:26:23 +0000 (00:26 +0000)]
am
8563d90f: Merge "Move preview transform matrix code into portability library" into ub-camera-glacier
* commit '
8563d90f706ac7505014d59fda2bcef92c221c6e':
Move preview transform matrix code into portability library
Sol Boucher [Sat, 16 Aug 2014 00:26:23 +0000 (00:26 +0000)]
am
f67f64f3: Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
* commit '
f67f64f3b5272d1da317b8eda8e1ea1e46539416':
Enable seamless switching to/from camera2-backed Photo module
Andy Huibers [Fri, 15 Aug 2014 21:44:23 +0000 (21:44 +0000)]
am
a69d497f: Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier
* commit '
a69d497fd44faab8afe65b748dfede715ea7239f':
Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
Sol Boucher [Sat, 16 Aug 2014 00:23:35 +0000 (00:23 +0000)]
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
Sol Boucher [Tue, 5 Aug 2014 06:41:38 +0000 (23:41 -0700)]
Enable seamless switching to/from camera2-backed Photo module
This supports running individual modules against the camera2 API framework while
the rest of the modules use the legacy Camera class.
Bug:
16875535
Change-Id: Ic0ae313a3dd96ba22bacc36c7b1712b183b713ff
Sascha Haeberling [Fri, 15 Aug 2014 20:26:24 +0000 (20:26 +0000)]
am
fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
* commit '
fa7b92c1ee99bc6734c06bb50445cffae94e8197':
Add ability to add a ready-state changed listener to the camera.
Andy Huibers [Fri, 15 Aug 2014 21:39:05 +0000 (21:39 +0000)]
Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier
Andy Huibers [Fri, 15 Aug 2014 19:56:42 +0000 (12:56 -0700)]
Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
Bug:
17028594
Change-Id: I8ce7dbd12f2b14a50068d8b034e7a80d8840f012
Sascha Haeberling [Fri, 15 Aug 2014 20:20:53 +0000 (20:20 +0000)]
Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
Sascha Haeberling [Fri, 15 Aug 2014 17:52:37 +0000 (10:52 -0700)]
Add ability to add a ready-state changed listener to the camera.
Bug:
16945820
Bug:
16948752
This enables us to hook up memory intense cameras and make sure we don't
activate the shutter button if the camera is not ready.
Change-Id: I70a31c76e063d775c844404ee9e20e583fa233e3
OSDN Git Service
